Commit Graph

5012 Commits

Author SHA1 Message Date
Android (Google) Code Review
8ca6c38ceb Merge change I9b771df3 into eclair
* changes:
  Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
2009-10-05 18:28:26 -04:00
Fred Quintana
d12e839b04 am 24f32b32: Merge change I89c40f50 into eclair
Merge commit '24f32b32f96eab8645a3ccf429c3d5694d2134ad' into eclair-mr2

* commit '24f32b32f96eab8645a3ccf429c3d5694d2134ad':
  fix a javadoc build breakage
2009-10-05 14:29:43 -07:00
Android (Google) Code Review
8bdf7aff38 Merge change I89c40f50 into eclair
* changes:
  fix a javadoc build breakage
2009-10-05 17:23:13 -04:00
Android (Google) Code Review
b3d3d13e86 Merge change Ifb63d236 into eclair-mr2
* changes:
  Add cancel() VCardDataBuilder, which is intended to remove a false alerm "Nested VCard code is not supported now." when importing vCard 3.0 file.
2009-10-05 16:56:37 -04:00
Bjorn Bringert
bf729776f4 am 9e4c8561: Merge change I8d48149c into eclair
Merge commit '9e4c85614c861f095131ffa76e65cbba55d03d0a' into eclair-mr2

* commit '9e4c85614c861f095131ffa76e65cbba55d03d0a':
  Don't reinflate search bar when dialog is already showing
2009-10-05 13:20:31 -07:00
Android (Google) Code Review
e00c273cb8 Merge change I8d48149c into eclair
* changes:
  Don't reinflate search bar when dialog is already showing
2009-10-05 16:15:14 -04:00
Dianne Hackborn
5b28d7859c am 9830a4ac: Fix issue #2161169: onStop not being called.
Merge commit '9830a4ac42c9e16db91d1de6120cc2eb613fc946' into eclair-mr2

* commit '9830a4ac42c9e16db91d1de6120cc2eb613fc946':
  Fix issue #2161169: onStop not being called.
2009-10-05 12:58:24 -07:00
Android (Google) Code Review
f37e9019d3 Merge change I5101c2b1 into eclair-mr2
* changes:
  Extend the date time to handle the case where the month is in the full name.
2009-10-05 14:49:38 -04:00
Fred Quintana
49f8f60508 am f7ae77cd: account manager api review changes
Merge commit 'f7ae77cd67f1a3993b8e56c1af4720a7adf4e69d' into eclair-mr2

* commit 'f7ae77cd67f1a3993b8e56c1af4720a7adf4e69d':
  account manager api review changes
2009-10-05 11:34:43 -07:00
Dianne Hackborn
883c50b667 am 48e6725c: Merge change Iaca22686 into eclair
Merge commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f' into eclair-mr2

* commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f':
  Work on issue #2163789: Way too much logging
2009-10-04 15:41:35 -07:00
Android (Google) Code Review
e3ba5c140e Merge change Iaca22686 into eclair
* changes:
  Work on issue #2163789: Way too much logging
2009-10-04 18:35:24 -04:00
Dianne Hackborn
48ee51870e am cbc52b7b: Merge change Iee638412 into eclair
Merge commit 'cbc52b7bcbea7dc6ae3b7cfc84fd44ae86711910' into eclair-mr2

* commit 'cbc52b7bcbea7dc6ae3b7cfc84fd44ae86711910':
  Fix issue #2161726: Car dock app bypasses setup wizard
2009-10-04 15:27:09 -07:00
Scott Main
daaccd111d am 87d5004d: am e9e1cdd5: decode the search string before putting it into the search control. this fixes a safari-only bug in which encoded chars were inserted into the search string.
Merge commit '87d5004d3b62441a55b2aba870e4276af6c771eb' into eclair-mr2

* commit '87d5004d3b62441a55b2aba870e4276af6c771eb':
  decode the search string before putting it into the search control.
2009-10-04 15:27:00 -07:00
Mike Lockwood
f6c2bed73d am 2ecf3f5e: dumpstate: Add backlight information to bugreport output.
Merge commit '2ecf3f5e00ea2ac630ffb405baba33113596cf38' into eclair-mr2

* commit '2ecf3f5e00ea2ac630ffb405baba33113596cf38':
  dumpstate: Add backlight information to bugreport output.
2009-10-04 15:22:08 -07:00
Mathias Agopian
f7c539a9ed am f8e4bc9f: Merge change I0c4cec7e into eclair
Merge commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70' into eclair-mr2

* commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70':
  Attempt to fix [2152536] ANR in browser
2009-10-04 15:21:34 -07:00
Jason Sams
2a10c3abcb am 8df16d63: Merge change I7f047786 into eclair
Merge commit '8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc' into eclair-mr2

* commit '8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc':
  Update the SimpleMesh API to support new attribute types.  Also spilt add/set commands to avoid permutation explosion.
2009-10-04 15:21:04 -07:00
Dmitri Plotnikov
c7ce573a47 am 82e863d8: Merge change Ic0d82ef1 into eclair
Merge commit '82e863d8ab5166fec3dce96ae865d1e2d3bbc021' into eclair-mr2

* commit '82e863d8ab5166fec3dce96ae865d1e2d3bbc021':
  [Issue 2161366] Changing capitalization of string "Via" to "via"
2009-10-04 15:20:26 -07:00
Android (Google) Code Review
5053fcd11e Merge change Iee638412 into eclair
* changes:
  Fix issue #2161726: Car dock app bypasses setup wizard
2009-10-04 18:19:29 -04:00
San Mehat
815fbdff91 am 7b16834a: Merge change Iaf686344 into eclair
Merge commit '7b16834adc1003f492cd2be4b1bcc3fb73a78c23' into eclair-mr2

* commit '7b16834adc1003f492cd2be4b1bcc3fb73a78c23':
  dumpstate: Display mtime instead of ctime
2009-10-04 15:19:27 -07:00
Wei Huang
3d32110de0 am 6b370745: bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
Merge commit '6b3707452c5921c89258371eec140b0fb76766f8' into eclair-mr2

* commit '6b3707452c5921c89258371eec140b0fb76766f8':
  bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
2009-10-04 15:19:08 -07:00
Mike Cleron
7e7648ccdf am df64cb41: Merge change I80ce8833 into eclair
Merge commit 'df64cb41fb44d56957cba8e375788d98af7bd8b4' into eclair-mr2

* commit 'df64cb41fb44d56957cba8e375788d98af7bd8b4':
  Icons again
2009-10-04 15:17:27 -07:00
David Brown
1d0d1a81ae am 88e03757: RotarySelector widget: add callback for "grabbed" state changes.
Merge commit '88e037577f7db140e4ef88b77eefaa910e06e5f5' into eclair-mr2

* commit '88e037577f7db140e4ef88b77eefaa910e06e5f5':
  RotarySelector widget: add callback for "grabbed" state changes.
2009-10-04 15:17:18 -07:00
Eric Fischer
bb1311c7fd am 3d7bb3a5: (-s ours) Merge change I3ca8fb69 into eclair
Merge commit '3d7bb3a5e49b559725bba84390b1021d9c527347' into eclair-mr2

* commit '3d7bb3a5e49b559725bba84390b1021d9c527347':
  Import revised translations.  DO NOT MERGE
2009-10-04 15:16:07 -07:00
Jaikumar Ganesh
0eed5fb0db am d453fe67: Merge change I5dbd1994 into eclair
Merge commit 'd453fe6709c4d28350e34fa39b4fe73d98a36a0c' into eclair-mr2

* commit 'd453fe6709c4d28350e34fa39b4fe73d98a36a0c':
  Fix rfcomm socket connect return code.
2009-10-04 15:14:55 -07:00
Mathias Agopian
d11f60ec4f am 4ac45597: Merge change I15b0ebb9 into eclair
Merge commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d' into eclair-mr2

* commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d':
  a simple test app for gralloc
2009-10-04 15:14:32 -07:00
Joe Onorato
040d07bff5 am d14cfc27: Merge change I9e384ddd into eclair
Merge commit 'd14cfc27627107c2973eeacc3bcbb2830a3fd620' into eclair-mr2

* commit 'd14cfc27627107c2973eeacc3bcbb2830a3fd620':
  Add a test pattern as rollo's icon
2009-10-04 15:14:08 -07:00
John Wang
285c10b073 am 99510681: Unhide constant DATA_ACTIVITY_DORMANT.
Merge commit '99510681e9f1c76f82719e724990f744cfdbcefd' into eclair-mr2

* commit '99510681e9f1c76f82719e724990f744cfdbcefd':
  Unhide constant DATA_ACTIVITY_DORMANT.
2009-10-04 15:13:58 -07:00
Scott Main
b5e834ca25 am e9e1cdd5: decode the search string before putting it into the search control. this fixes a safari-only bug in which encoded chars were inserted into the search string.
Merge commit 'e9e1cdd556b40a04637b7de3d839b2a596df47e3' into eclair

* commit 'e9e1cdd556b40a04637b7de3d839b2a596df47e3':
  decode the search string before putting it into the search control.
2009-10-04 15:05:43 -07:00
Android (Google) Code Review
0b7b65da2f Merge change I0c4cec7e into eclair
* changes:
  Attempt to fix [2152536] ANR in browser
2009-10-02 23:35:12 -04:00
Android (Google) Code Review
09fa0b2d73 Merge change I7f047786 into eclair
* changes:
  Update the SimpleMesh API to support new attribute types.  Also spilt add/set commands to avoid permutation explosion.
2009-10-02 21:40:07 -04:00
Mathias Agopian
0b3ad46a26 Attempt to fix [2152536] ANR in browser
The ANR is caused by SurfaceFlinger waiting for buffers of a removed surface to become availlable.
When it is removed from the current list, a Surface is marked as NO_INIT, which causes SF to return
immediately in the above case. For some reason, the surface here wasn't marked as NO_INIT.

This change makes the code more robust by always (irregadless or errors) setting the NO_INIT status
in all code paths where a surface is removed from the list.

Additionaly added more information in the logs, should this happen again.
2009-10-02 18:12:30 -07:00
Android (Google) Code Review
b3e869c7a8 Merge change Ic0d82ef1 into eclair
* changes:
  [Issue 2161366] Changing capitalization of string "Via" to "via"
2009-10-02 19:17:30 -04:00
Android (Google) Code Review
83af4c76ba Merge change Ib4285d22 into eclair-mr2
* changes:
  Change way we choose EGL surfaces to be compatible with the native window surface.
2009-10-02 17:49:59 -04:00
Jack Palevich
99dd08fc36 Change way we choose EGL surfaces to be compatible with the native
window surface.
2009-10-02 14:43:51 -07:00
Android (Google) Code Review
95cacf9e36 Merge change Ic66f68a7 into eclair-mr2
* changes:
  Fix a null pointer exception caught by the monkey.
2009-10-02 16:35:51 -04:00
Android (Google) Code Review
c91af0c12e Merge change Iaf686344 into eclair
* changes:
  dumpstate: Display mtime instead of ctime
2009-10-02 16:34:02 -04:00
Android (Google) Code Review
0730b80d66 Merge change I499a9541 into eclair-mr2
* changes:
  setupRedirect() can throw. Catch it and signal the error.
2009-10-02 16:28:11 -04:00
Android (Google) Code Review
4d15bec90d Merge change I80ce8833 into eclair
* changes:
  Icons again
2009-10-02 03:51:19 -04:00
Android (Google) Code Review
d835114b97 Merge change I3ca8fb69 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-10-02 00:47:08 -04:00
Android (Google) Code Review
e659abef6d Merge change I5dbd1994 into eclair
* changes:
  Fix rfcomm socket connect return code.
2009-10-01 22:46:23 -04:00
Android (Google) Code Review
c999d3f235 Merge change I15b0ebb9 into eclair
* changes:
  a simple test app for gralloc
2009-10-01 20:25:45 -04:00
Mathias Agopian
7460160b80 a simple test app for gralloc 2009-10-01 17:23:05 -07:00
Android (Google) Code Review
2a307faa64 Merge change I9e384ddd into eclair
* changes:
  Add a test pattern as rollo's icon
2009-10-01 19:49:27 -04:00
android-build SharedAccount
598331dd30 Merge commit 'goog/eclair' into eclair-release 2009-10-01 08:43:40 -07:00
Android (Google) Code Review
3431c6cba8 Merge change I6e01fa52 into eclair
* changes:
  Remove unneeded icon.
2009-10-01 11:01:34 -04:00
Android (Google) Code Review
00dcab7c05 Merge change Ic2a16d4f into eclair
* changes:
  b/2148252 Fix emulator
2009-10-01 10:52:01 -04:00
Android (Google) Code Review
3a6e128828 Merge change Ia8826d67 into eclair
* changes:
  improve boot animation a bit
2009-10-01 06:16:25 -04:00
Android (Google) Code Review
64005a6ff0 Merge change Ie69a9c0a into eclair
* changes:
  Remove globalSearch argument from triggerSearch()
2009-10-01 05:10:15 -04:00
Android (Google) Code Review
0026f57ccc Merge change I55c9c7b7 into eclair
* changes:
  New 1x status bar icons
2009-10-01 04:48:32 -04:00
Android (Google) Code Review
dea7c01361 Merge change I4fe2a47a into eclair
* changes:
  Fix stopping all vpn daemons before connect and more.
2009-10-01 04:39:38 -04:00