Commit Graph

5504 Commits

Author SHA1 Message Date
Wei Huang
e2e28d5cda am d35db5ec: Merge change 26946 into eclair
Merge commit 'd35db5ec8bd5ef07840fa84318284df04a69411c' into eclair-plus-aosp

* commit 'd35db5ec8bd5ef07840fa84318284df04a69411c':
  Fix bug#2144742: guard against 0 length encoded string when attaching a 'from' address for MMS.
2009-09-24 16:19:52 -07:00
Jason Sams
4e27157d1c am 0d3999f7: Merge change 26942 into eclair
Merge commit '0d3999f788eb01baa8ba671878387761cbbbf861' into eclair-plus-aosp

* commit '0d3999f788eb01baa8ba671878387761cbbbf861':
  Minor cleanup of profile and compile logging.
2009-09-24 16:19:47 -07:00
Android (Google) Code Review
9661c2dcb9 Merge change 26946 into eclair
* changes:
  Fix bug#2144742: guard against 0 length encoded string when attaching a 'from' address for MMS.
2009-09-24 19:13:30 -04:00
Android (Google) Code Review
d4d9acbc89 Merge change 26942 into eclair
* changes:
  Minor cleanup of profile and compile logging.
2009-09-24 18:46:39 -04:00
Raphael
c7b288031d am 20b39471: Merge change 26933 into eclair
Merge commit '20b394719daa218be7ff767fad024504f12e937b' into eclair-plus-aosp

* commit '20b394719daa218be7ff767fad024504f12e937b':
  AAPT: Ignore visual source safe files in resources
2009-09-24 15:45:17 -07:00
Android (Google) Code Review
72018d83ae Merge change 26933 into eclair
* changes:
  AAPT: Ignore visual source safe files in resources
2009-09-24 18:36:37 -04:00
Mathias Agopian
73511f19f5 am b9c932ba: Merge change 26925 into eclair
Merge commit 'b9c932ba1203b477abbb0695d8b7162f45b4e91e' into eclair-plus-aosp

* commit 'b9c932ba1203b477abbb0695d8b7162f45b4e91e':
  minor SurfaceFlinger code cleanup and remove unnecessary tests
2009-09-24 15:30:40 -07:00
Android (Google) Code Review
7fc4baebbb Merge change 26925 into eclair
* changes:
  minor SurfaceFlinger code cleanup and remove unnecessary tests
2009-09-24 18:21:40 -04:00
Jason Sams
91126e1ba3 am a6a4113d: Merge change 26917 into eclair
Merge commit 'a6a4113d50d43930099d26b5f420f293c475e484' into eclair-plus-aosp

* commit 'a6a4113d50d43930099d26b5f420f293c475e484':
  Fix invokables to make sure script pointers are setup before invoking function calls.  Reduce app startup time up to 1s.
2009-09-24 15:01:10 -07:00
Daisuke Miyakawa
bcf7d8f70d am b7e89e4c: Merge change 26912 into eclair
Merge commit 'b7e89e4cdc4d0e769244b2ceaf9077359843de13' into eclair-plus-aosp

* commit 'b7e89e4cdc4d0e769244b2ceaf9077359843de13':
  Add appendType() utility method.
2009-09-24 15:01:05 -07:00
Mathias Agopian
95a666b0e0 minor SurfaceFlinger code cleanup and remove unnecessary tests 2009-09-24 14:57:26 -07:00
Android (Google) Code Review
0a1eeae059 Merge change 26917 into eclair
* changes:
  Fix invokables to make sure script pointers are setup before invoking function calls.  Reduce app startup time up to 1s.
2009-09-24 17:56:39 -04:00
Android (Google) Code Review
4bb432e035 Merge change 26912 into eclair
* changes:
  Add appendType() utility method.
2009-09-24 17:56:13 -04:00
Mathias Agopian
6688afdcb0 am 117f574e: Merge change 26911 into eclair
Merge commit '117f574e105c682ebff19ece7230fab86fea3d17' into eclair-plus-aosp

* commit '117f574e105c682ebff19ece7230fab86fea3d17':
  OpenGL ES doesn't allow glColorPointer with a size parameter other than 4
2009-09-24 14:51:00 -07:00
Android (Google) Code Review
80e2b2ff72 Merge change 26911 into eclair
* changes:
  OpenGL ES doesn't allow glColorPointer with a size parameter other than 4
2009-09-24 17:45:32 -04:00
Nicolas Roard
de3519363c am dccf22dc: Merge change 26698 into eclair
Merge commit 'dccf22dcea384e65ae54456122b5c660e6fefe00' into eclair-plus-aosp

* commit 'dccf22dcea384e65ae54456122b5c660e6fefe00':
  Fix the shortcuts
2009-09-24 14:41:31 -07:00
Bryan Mawhinney
f4f38f325a am dfb7bc8c: Merge change 26821 into eclair
Merge commit 'dfb7bc8c87d8fe694164038cf292c9913fae9bdb' into eclair-plus-aosp

* commit 'dfb7bc8c87d8fe694164038cf292c9913fae9bdb':
  Make removeOnAccountsUpdateListener cope with null handlers.
2009-09-24 14:38:58 -07:00
Android (Google) Code Review
bb5a2c9197 Merge change 26698 into eclair
* changes:
  Fix the shortcuts
2009-09-24 17:35:11 -04:00
Fred Quintana
f912da3860 am 531e580a: remove the incorrectly located nickname
Merge commit '531e580ab160864e4152f431eaeb965676c58d19' into eclair-plus-aosp

* commit '531e580ab160864e4152f431eaeb965676c58d19':
  remove the incorrectly located nickname
2009-09-24 14:31:43 -07:00
Grace Kloba
c21268f25a am f4a36e86: Merge change 26909 into eclair
Merge commit 'f4a36e86bb4d1e15652dfd28236150c7f917866e' into eclair-plus-aosp

* commit 'f4a36e86bb4d1e15652dfd28236150c7f917866e':
  Not all WebView's host have permission to read the history.
2009-09-24 14:31:38 -07:00
Android (Google) Code Review
8c783c7dd1 Merge change 26821 into eclair
* changes:
  Make removeOnAccountsUpdateListener cope with null handlers.
2009-09-24 17:29:53 -04:00
Android (Google) Code Review
4adfacb5af Merge change 26909 into eclair
* changes:
  Not all WebView's host have permission to read the history. Add a security catch and return an empty list.
2009-09-24 17:24:40 -04:00
Mathias Agopian
c5f0155d7f OpenGL ES doesn't allow glColorPointer with a size parameter other than 4 2009-09-24 14:22:29 -07:00
Jack Palevich
94751b12ed am b87f24a6: Merge change 26908 into eclair
Merge commit 'b87f24a6a88a994256ca97b69904af28824bc9ce' into eclair-plus-aosp

* commit 'b87f24a6a88a994256ca97b69904af28824bc9ce':
  Fix broken Javadoc link for GLSurfaceView.EGLWindowSurfaceFactory.
2009-09-24 14:16:48 -07:00
jsh
4cca4cd415 am 857ce94b: Merge change 26900 into eclair
Merge commit '857ce94b88d53c3deb965898098f04fbf42e55e1' into eclair-plus-aosp

* commit '857ce94b88d53c3deb965898098f04fbf42e55e1':
  Print IMEI/MEID in dumpsys.
2009-09-24 14:12:00 -07:00
Dmitri Plotnikov
4f6d58815b am 6938bb36: Fixing the broken build
Merge commit '6938bb36b8992420ec5cb392706a8bc192b332c1' into eclair-plus-aosp

* commit '6938bb36b8992420ec5cb392706a8bc192b332c1':
  Fixing the broken build
2009-09-24 14:11:55 -07:00
Android (Google) Code Review
38771da39b Merge change 26908 into eclair
* changes:
  Fix broken Javadoc link for GLSurfaceView.EGLWindowSurfaceFactory.
2009-09-24 17:11:00 -04:00
Android (Google) Code Review
1ae4f51bed Merge change 26900 into eclair
* changes:
  Print IMEI/MEID in dumpsys.
2009-09-24 17:06:49 -04:00
Cary Clark
ce90387acf am f18c5393: set the selection after sending a click
Merge commit 'f18c539344655c8d39e3412a0985f7e42193eb52' into eclair-plus-aosp

* commit 'f18c539344655c8d39e3412a0985f7e42193eb52':
  set the selection after sending a click
2009-09-24 13:51:10 -07:00
Dmitri Plotnikov
b383fbcb76 am f22fc124: Adding timestamp and account to contact-level presence columns.
Merge commit 'f22fc124ff7974d0b6380199f7d53e66bb7feb29' into eclair-plus-aosp

* commit 'f22fc124ff7974d0b6380199f7d53e66bb7feb29':
  Adding timestamp and account to contact-level presence columns.
2009-09-24 13:32:18 -07:00
Daisuke Miyakawa
4384a29258 am f2bed60b: Add final to appropriate variables.
Merge commit 'f2bed60bd4921bf71a9cf05b46f000f1cdb20af8' into eclair-plus-aosp

* commit 'f2bed60bd4921bf71a9cf05b46f000f1cdb20af8':
  Add final to appropriate variables.
2009-09-24 13:32:13 -07:00
Daisuke Miyakawa
2862721f3f am b55e60e1: Fix vCard code.
Merge commit 'b55e60e1d88c02078c3d6bc0f408fb0065a1e93c' into eclair-plus-aosp

* commit 'b55e60e1d88c02078c3d6bc0f408fb0065a1e93c':
  Fix vCard code.
2009-09-24 13:21:48 -07:00
Grace Kloba
9d17065778 am 43f99202: Merge change 26896 into eclair
Merge commit '43f9920271848c0ec84a958bfa06542c8fb7e4fa' into eclair-plus-aosp

* commit '43f9920271848c0ec84a958bfa06542c8fb7e4fa':
  ResultTransport needs a default value. If the thread is
2009-09-24 12:43:57 -07:00
Jason Sams
310e5f1514 am a183cb5e: Merge change 26897 into eclair
Merge commit 'a183cb5ebd974096afe2335cd4254de68d55021e' into eclair-plus-aosp

* commit 'a183cb5ebd974096afe2335cd4254de68d55021e':
  Removed last bits of predefined element types from native code.  Predefined types are now constructed at the java layer from standard building blocks.
2009-09-24 12:43:44 -07:00
Jason Sams
291a637f10 am e31c0b56: Merge change 26708 into eclair
Merge commit 'e31c0b5693f8887410d54d590ebf1ccb05ba0cc8' into eclair-plus-aosp

* commit 'e31c0b5693f8887410d54d590ebf1ccb05ba0cc8':
  Remove depricated triangleMesh.
2009-09-24 12:43:30 -07:00
Android (Google) Code Review
1f289252ed Merge change 26896 into eclair
* changes:
  ResultTransport needs a default value. If the thread is ununlocked by something else other than CallbackProxy's notify(), it can have a null value.
2009-09-24 15:35:22 -04:00
Android (Google) Code Review
9e19510aba Merge change 26897 into eclair
* changes:
  Removed last bits of predefined element types from native code.  Predefined types are now constructed at the java layer from standard building blocks.
2009-09-24 15:35:17 -04:00
Android (Google) Code Review
0866362413 Merge change 26708 into eclair
* changes:
  Remove depricated triangleMesh.
2009-09-24 15:34:26 -04:00
Satish Roddom
ca372e7820 am 03d2009b: Merge change 26895 into eclair
Merge commit '03d2009b3e41137ed5b17a9bcdd019ec962095e6' into eclair-plus-aosp

* commit '03d2009b3e41137ed5b17a9bcdd019ec962095e6':
  Subject issue in MMS message
2009-09-24 12:34:10 -07:00
Jack Palevich
a20c4b58fb am d0b58414: Merge change 26891 into eclair
Merge commit 'd0b584148bdcc219136d92e2034e316ae50c8151' into eclair-plus-aosp

* commit 'd0b584148bdcc219136d92e2034e316ae50c8151':
  Make tritex test run with latest OpenGL driver.
2009-09-24 12:27:16 -07:00
Android (Google) Code Review
8f3dbf6c7e Merge change 26895 into eclair
* changes:
  Subject issue in MMS message
2009-09-24 15:26:19 -04:00
Lixin Yue
e33aaa1b9d am bfe1297b: Merge change 26869 into eclair
Merge commit 'bfe1297b12b1a81203dbd42ebbca7ff1916f1db7' into eclair-plus-aosp

* commit 'bfe1297b12b1a81203dbd42ebbca7ff1916f1db7':
  Add call log support to pim.vcard.VCardComposer
2009-09-24 12:23:42 -07:00
Android (Google) Code Review
a7eaf7bb0d Merge change 26891 into eclair
* changes:
  Make tritex test run with latest OpenGL driver.
2009-09-24 15:20:13 -04:00
Jack Palevich
bc4a4177a3 Make tritex test run with latest OpenGL driver.
Use EGLUtils::selectConfigForNativeWindow to select a legitimate
configuration. (Before now we had been selecting an incorrect
configuration, but the older drivers let us get away with it.)

Converted the source to C++ so we can call selectConfigForNativeWindow.
2009-09-24 12:19:05 -07:00
Android (Google) Code Review
190f7f754d Merge change 26869 into eclair
* changes:
  Add call log support to pim.vcard.VCardComposer
2009-09-24 15:13:19 -04:00
Jack Palevich
89fdf85bf2 am 1267b0e1: Merge change 26882 into eclair
Merge commit '1267b0e1844ac802de92b203007513573e4886fd' into eclair-plus-aosp

* commit '1267b0e1844ac802de92b203007513573e4886fd':
  Publish minor additions to GLSurfaceView API.
2009-09-24 12:06:29 -07:00
Android (Google) Code Review
75608eec6e Merge change 26882 into eclair
* changes:
  Publish minor additions to GLSurfaceView API.
2009-09-24 14:56:00 -04:00
Grace Kloba
67b7f87a0d am bb6aba19: Merge change 26876 into eclair
Merge commit 'bb6aba1984bfdceaec43054ef0b2a8e5dcd26215' into eclair-plus-aosp

* commit 'bb6aba1984bfdceaec43054ef0b2a8e5dcd26215':
  Restrict touch to the view height with the title. This
2009-09-24 11:52:45 -07:00
Android (Google) Code Review
b7f6499ffe Merge change 26876 into eclair
* changes:
  Restrict touch to the view height with the title. This should fix the links in the bottom of the screen are not touchable when title bar presents.
2009-09-24 14:45:57 -04:00
Christopher Tate
21d9a1ee52 am 4cc86e1a: Clear the device\'s data from the transport when backup is disabled
Merge commit '4cc86e1ae80eb1938500fe5fa06bbdf8b4b7b50d' into eclair-plus-aosp

* commit '4cc86e1ae80eb1938500fe5fa06bbdf8b4b7b50d':
  Clear the device's data from the transport when backup is disabled
2009-09-24 11:36:07 -07:00