Commit Graph

5674 Commits

Author SHA1 Message Date
Scott Main
4aed1e157d am ea1241f0: Merge change 26244 into eclair
Merge commit 'ea1241f037b0071c8948eb0b438d768cc9fa326b' into eclair-plus-aosp

* commit 'ea1241f037b0071c8948eb0b438d768cc9fa326b':
  docs only.
2009-09-24 20:28:51 -07:00
Christopher Tate
fc7b299ed4 am 3656a344: Merge change 26974 into eclair
Merge commit '3656a344072394f1ac9804be1c0d63f341233667' into eclair-plus-aosp

* commit '3656a344072394f1ac9804be1c0d63f341233667':
  Disallow concurrent backups; consult transport requestBackupTime()
2009-09-24 20:28:47 -07:00
Android (Google) Code Review
adbb656ae8 Merge change 26244 into eclair
* changes:
  docs only. change sdk sidenav for offline docs to exclude SDK-specific links like installing/upgrading. revise the offline home page.
2009-09-24 23:22:31 -04:00
Android (Google) Code Review
b2191ff044 Merge change 26974 into eclair
* changes:
  Disallow concurrent backups; consult transport requestBackupTime()
2009-09-24 23:22:29 -04:00
Peng Zhu
7cc71debb2 am 56024f26: Merge change 26991 into eclair
Merge commit '56024f260f993c70a65aca0081c78b21801a7c5a' into eclair-plus-aosp

* commit '56024f260f993c70a65aca0081c78b21801a7c5a':
  Add null check at isEmergencyNumber().
2009-09-24 19:55:42 -07:00
Android (Google) Code Review
2f2a738cc8 Merge change 26991 into eclair
* changes:
  Add null check at isEmergencyNumber().
2009-09-24 22:50:28 -04:00
Nick Pelly
17b9dabec9 am 1a42cfac: Use LM_SECURE when auth && encrypt.
Merge commit '1a42cfac152faa98c2e3d9e9fd6889209de195fe' into eclair-plus-aosp

* commit '1a42cfac152faa98c2e3d9e9fd6889209de195fe':
  Use LM_SECURE when auth && encrypt.
2009-09-24 19:47:08 -07:00
Nick Pelly
abd024348c am 18b1e79a: Bluetooth API: Do not allow apps to programmatically make BT discoverable.
Merge commit '18b1e79a123b979d25bfa5d0b0ee5d0382dbd64b' into eclair-plus-aosp

* commit '18b1e79a123b979d25bfa5d0b0ee5d0382dbd64b':
  Bluetooth API: Do not allow apps to programmatically make BT discoverable.
2009-09-24 19:47:03 -07:00
Jason Sams
4556de4272 am cc89ef3d: Merge change 26971 into eclair
Merge commit 'cc89ef3d6e9b1f9be657c9158ad04b8de104434c' into eclair-plus-aosp

* commit 'cc89ef3d6e9b1f9be657c9158ad04b8de104434c':
  Implement pause/resume for the RS thread.
2009-09-24 17:58:13 -07:00
Android (Google) Code Review
0e4db5db07 Merge change 26971 into eclair
* changes:
  Implement pause/resume for the RS thread.
2009-09-24 20:50:39 -04:00
Chih-Chung Chang
21ad2cb263 am 0665ae22: Merge change 26939 into eclair
Merge commit '0665ae22aa51183d6ff5fdd0abeee0344306e89d' into eclair-plus-aosp

* commit '0665ae22aa51183d6ff5fdd0abeee0344306e89d':
  Fix 2101425: Camera crashes spontaneously in preview.
2009-09-24 17:04:38 -07:00
Karl Rosaen
72bbce24b4 am 0808c961: Merge change 26954 into eclair
Merge commit '0808c961264cd4a9961ac4cb167208d7b1d14dbb' into eclair-plus-aosp

* commit '0808c961264cd4a9961ac4cb167208d7b1d14dbb':
  Update layouts to show status (battery, alarm) info on pattern unlock screen.  make buttons dark.
2009-09-24 17:00:04 -07:00
Yu Shan Emily Lau
9f83a2287c am 7d0bdfaf: Merge change 26948 into eclair
Merge commit '7d0bdfaf9adbdaee0b8979d3d23b5b7ecb8a90a9' into eclair-plus-aosp

* commit '7d0bdfaf9adbdaee0b8979d3d23b5b7ecb8a90a9':
  Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build
2009-09-24 16:59:59 -07:00
Android (Google) Code Review
fee8a6d958 Merge change 26939 into eclair
* changes:
  Fix 2101425: Camera crashes spontaneously in preview.
2009-09-24 19:59:08 -04:00
Fred Quintana
7734d0db7f am 91a00d3a: fix typo
Merge commit '91a00d3a421868ad06441f131eaca8fcbbbb4fa1' into eclair-plus-aosp

* commit '91a00d3a421868ad06441f131eaca8fcbbbb4fa1':
  fix typo
2009-09-24 16:54:19 -07:00
Fred Quintana
fba6f68def am f5808415: rename misc to birthday
Merge commit 'f5808415263d687eb125535e04ba374e33b785da' into eclair-plus-aosp

* commit 'f5808415263d687eb125535e04ba374e33b785da':
  rename misc to birthday
2009-09-24 16:54:13 -07:00
Android (Google) Code Review
807e86aeac Merge change 26954 into eclair
* changes:
  Update layouts to show status (battery, alarm) info on pattern unlock screen.  make buttons dark.
2009-09-24 19:54:07 -04:00
Android (Google) Code Review
9d30ae1856 Merge change 26948 into eclair
* changes:
  Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build
2009-09-24 19:53:57 -04:00
Daisuke Miyakawa
bb77f1a916 am 4579ed28: Merge change 26944 into eclair
Merge commit '4579ed287a0f6fc32fbfefdd5c7cf69491fdae99' into eclair-plus-aosp

* commit '4579ed287a0f6fc32fbfefdd5c7cf69491fdae99':
  Add "TYPE=" to type attribute when appropriate.
2009-09-24 16:38:52 -07:00
Android (Google) Code Review
51a8d6fed9 Merge change 26944 into eclair
* changes:
  Add "TYPE=" to type attribute when appropriate.
2009-09-24 19:31:20 -04:00
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