OSDN Git Service
Andreas Huber [Thu, 8 Oct 2009 21:38:48 +0000 (14:38 -0700)]
am
23bccd6c: Merge change I729c3938 into eclair-mr2
Merge commit '
23bccd6c25f581860487835bf7b5442589897352' into eclair-mr2-plus-aosp
* commit '
23bccd6c25f581860487835bf7b5442589897352':
Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
Brett Chabot [Thu, 8 Oct 2009 21:38:45 +0000 (14:38 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Android (Google) Code Review [Thu, 8 Oct 2009 21:19:10 +0000 (17:19 -0400)]
Merge change I729c3938 into eclair-mr2
* changes:
Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
Jaikumar Ganesh [Thu, 8 Oct 2009 20:18:30 +0000 (13:18 -0700)]
am
9d5b5899: Merge change Ie5d93b7e into eclair
Merge commit '
9d5b58991ef90e91b3c942c80ae3502ed62d10aa' into eclair-plus-aosp
* commit '
9d5b58991ef90e91b3c942c80ae3502ed62d10aa':
Set the Bond State to NONE when we receive a Agent Cancel.
Android (Google) Code Review [Thu, 8 Oct 2009 20:11:13 +0000 (16:11 -0400)]
Merge change Ie5d93b7e into eclair
* changes:
Set the Bond State to NONE when we receive a Agent Cancel.
John Wang [Thu, 8 Oct 2009 18:57:11 +0000 (11:57 -0700)]
am
33e21fcc: Control H icon display in Status bar.
Merge commit '
33e21fcc99dd91061ea245984c4e9a1544cb943f' into eclair-plus-aosp
* commit '
33e21fcc99dd91061ea245984c4e9a1544cb943f':
Control H icon display in Status bar.
John Wang [Thu, 8 Oct 2009 17:35:27 +0000 (10:35 -0700)]
Control H icon display in Status bar.
Bug
2138275. Add a config setting to control if status bar
should show different icons for UMTS and HSPA connnection.
Romain Guy [Thu, 8 Oct 2009 18:19:14 +0000 (11:19 -0700)]
am
3b36ed09: Merge change I95319bde into eclair
Merge commit '
3b36ed09293965e7e5dc20dfa514422388e796d6' into eclair-plus-aosp
* commit '
3b36ed09293965e7e5dc20dfa514422388e796d6':
Fixes #
2175599. Prevents an NPE when AttachInfo is null.
Daisuke Miyakawa [Thu, 8 Oct 2009 18:19:08 +0000 (11:19 -0700)]
am
387e73bd: Merge change Ib977f2bd into eclair
Merge commit '
387e73bd8fbecae0b95e3005ca8187ddbda1aff7' into eclair-plus-aosp
* commit '
387e73bd8fbecae0b95e3005ca8187ddbda1aff7':
Make vCard import Photo from vCard file :(
Tadashi G. Takaoka [Thu, 8 Oct 2009 18:17:14 +0000 (11:17 -0700)]
am
50b11ec6: Merge change I4d828c3a into eclair-mr2
Merge commit '
50b11ec6d955f098c2b8f9cd0573e494442cfc24' into eclair-mr2-plus-aosp
* commit '
50b11ec6d955f098c2b8f9cd0573e494442cfc24':
QuickContactBadge: Make lookup key query asynchronous.
Android (Google) Code Review [Thu, 8 Oct 2009 18:11:30 +0000 (14:11 -0400)]
Merge change I4d828c3a into eclair-mr2
* changes:
QuickContactBadge: Make lookup key query asynchronous.
Tadashi G. Takaoka [Fri, 2 Oct 2009 01:10:46 +0000 (18:10 -0700)]
QuickContactBadge: Make lookup key query asynchronous.
Internal Bug: http://b/
2130588
Android (Google) Code Review [Thu, 8 Oct 2009 17:53:54 +0000 (13:53 -0400)]
Merge change I95319bde into eclair
* changes:
Fixes #
2175599. Prevents an NPE when AttachInfo is null.
Joshua Bartel [Thu, 8 Oct 2009 17:53:27 +0000 (10:53 -0700)]
am
41ae5d5a: am
bd324c9b: Merge change I50a321c9 into eclair
Merge commit '
41ae5d5adda1987316b02d123a5698180abb1899' into eclair-mr2-plus-aosp
* commit '
41ae5d5adda1987316b02d123a5698180abb1899':
Daisuke Miyakawa [Thu, 8 Oct 2009 17:53:26 +0000 (10:53 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Android (Google) Code Review [Thu, 8 Oct 2009 17:49:39 +0000 (13:49 -0400)]
Merge change Ib977f2bd into eclair
* changes:
Make vCard import Photo from vCard file :(
Romain Guy [Thu, 8 Oct 2009 17:48:54 +0000 (10:48 -0700)]
Fixes #
2175599. Prevents an NPE when AttachInfo is null.
This bug was introduced by a change made to query the window's opacity.
Approved by mcleron.
Change-Id: I95319bde72b0faade095bbbbb317e84b9be8efa8
Joshua Bartel [Thu, 8 Oct 2009 17:41:13 +0000 (10:41 -0700)]
am
bd324c9b: Merge change I50a321c9 into eclair
Merge commit '
bd324c9bd32a3c86634c1cc1ab8525f46a56b694' into eclair-plus-aosp
* commit '
bd324c9bd32a3c86634c1cc1ab8525f46a56b694':
LocationManagerService: Fix race when removing LocationListener
Joshua Bartel [Thu, 8 Oct 2009 17:33:51 +0000 (10:33 -0700)]
am
bd324c9b: Merge change I50a321c9 into eclair
Merge commit '
bd324c9bd32a3c86634c1cc1ab8525f46a56b694' into eclair-mr2
* commit '
bd324c9bd32a3c86634c1cc1ab8525f46a56b694':
LocationManagerService: Fix race when removing LocationListener
Android (Google) Code Review [Thu, 8 Oct 2009 16:58:48 +0000 (12:58 -0400)]
Merge change I50a321c9 into eclair
* changes:
LocationManagerService: Fix race when removing LocationListener
Andreas Huber [Thu, 8 Oct 2009 16:22:29 +0000 (09:22 -0700)]
am
cd74c0d5: The vendor is about to check in a fix for this issue, the workaround is no longer needed
Merge commit '
cd74c0d56c0756ceb5cfa5f06d76e17aa2ed6fb9' into eclair-mr2-plus-aosp
* commit '
cd74c0d56c0756ceb5cfa5f06d76e17aa2ed6fb9':
The vendor is about to check in a fix for this issue, the workaround is no longer needed
Andreas Huber [Thu, 8 Oct 2009 16:12:11 +0000 (09:12 -0700)]
The vendor is about to check in a fix for this issue, the workaround is no longer needed
Andreas Huber [Thu, 8 Oct 2009 15:41:11 +0000 (08:41 -0700)]
Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
Since we cannot tell how long it'll take until surface flinger
has displayed the data onscreen, we'll just have to guess...
We must not return the buffer to the decoder before it's been displayed.
San Mehat [Thu, 8 Oct 2009 15:32:19 +0000 (08:32 -0700)]
am
4f9a7d42: am
e9296876: Merge change Ib7c34cec into eclair
Merge commit '
4f9a7d426b8be986947f6bf77e4ed90bf3f613e3' into eclair-mr2-plus-aosp
* commit '
4f9a7d426b8be986947f6bf77e4ed90bf3f613e3':
Bryan Mawhinney [Thu, 8 Oct 2009 15:32:13 +0000 (08:32 -0700)]
am
07e6da0b: am
f81ecc1f: Merge change I29232f2a into eclair
Merge commit '
07e6da0b7a342433850875b4d4d223cbb9d08d0b' into eclair-mr2-plus-aosp
* commit '
07e6da0b7a342433850875b4d4d223cbb9d08d0b':
Marc Blank [Thu, 8 Oct 2009 15:32:12 +0000 (08:32 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
San Mehat [Thu, 8 Oct 2009 15:24:16 +0000 (08:24 -0700)]
am
e9296876: Merge change Ib7c34cec into eclair
Merge commit '
e9296876140ba055d311f3f11af25beae652e6d8' into eclair-mr2
* commit '
e9296876140ba055d311f3f11af25beae652e6d8':
dumpstate: 'RAMCONSOLE' -> 'LAST KMSG'
San Mehat [Thu, 8 Oct 2009 15:23:02 +0000 (08:23 -0700)]
am
e9296876: Merge change Ib7c34cec into eclair
Merge commit '
e9296876140ba055d311f3f11af25beae652e6d8' into eclair-plus-aosp
* commit '
e9296876140ba055d311f3f11af25beae652e6d8':
dumpstate: 'RAMCONSOLE' -> 'LAST KMSG'
Android (Google) Code Review [Thu, 8 Oct 2009 15:11:50 +0000 (11:11 -0400)]
Merge change Ib7c34cec into eclair
* changes:
dumpstate: 'RAMCONSOLE' -> 'LAST KMSG'
San Mehat [Thu, 8 Oct 2009 00:03:00 +0000 (17:03 -0700)]
dumpstate: 'RAMCONSOLE' -> 'LAST KMSG'
Signed-off-by: San Mehat <san@google.com>
Joshua Bartel [Mon, 5 Oct 2009 16:44:46 +0000 (12:44 -0400)]
LocationManagerService: Fix race when removing LocationListener
In LocationManagerService if a LocationListener is removed while it has
a pending broadcast the wake lock held while pending broadcasts are
outstanding do not get cleared properly.
There are 2 cases of this race that are fixed:
1. locationCallbackFinished was changed to check the mReceivers HashMap
directly instead of calling getReceiver. getReceiver would add the
ILocationListener as a new Receiver if it did not exist which caused
a receiver that was removed when it still had a broadcast pending to
be added back in a bad state when the pending broadcast completed.
2. removeUpdatesLocked was changed to decrement the pending broadcasts
when a Receiver is removed that has pending broadcasts.
Fixes bug b/
2163871
Change-Id: I50a321c9b3359bf69845236dc4a4b9e38e847335
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jaikumar Ganesh [Thu, 8 Oct 2009 09:27:52 +0000 (02:27 -0700)]
Set the Bond State to NONE when we receive a Agent Cancel.
Sometimes during OPP, we can get stuck in Pairing state when the remote
end, cancels the Pairing process - we will just get onAgentCancel
and thus not set the Pairing state properly.
DrNo: Eastham
Bug:
2174874
Bryan Mawhinney [Thu, 8 Oct 2009 08:54:50 +0000 (01:54 -0700)]
am
f81ecc1f: Merge change I29232f2a into eclair
Merge commit '
f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54' into eclair-mr2
* commit '
f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54':
Only dismiss search dialog after launching intent.
Bryan Mawhinney [Thu, 8 Oct 2009 08:54:30 +0000 (01:54 -0700)]
am
f81ecc1f: Merge change I29232f2a into eclair
Merge commit '
f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54' into eclair-plus-aosp
* commit '
f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54':
Only dismiss search dialog after launching intent.
Android (Google) Code Review [Thu, 8 Oct 2009 08:49:23 +0000 (04:49 -0400)]
Merge change I29232f2a into eclair
* changes:
Only dismiss search dialog after launching intent.
Fred Quintana [Thu, 8 Oct 2009 07:59:29 +0000 (00:59 -0700)]
am
eb329bf2: am
8bd04b20: Merge change Iea48361d into eclair
Merge commit '
eb329bf2c2ced7224a37b0a84652a0933ee64736' into eclair-mr2-plus-aosp
* commit '
eb329bf2c2ced7224a37b0a84652a0933ee64736':
Xia Wang [Thu, 8 Oct 2009 07:59:29 +0000 (00:59 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Fred Quintana [Thu, 8 Oct 2009 07:55:03 +0000 (00:55 -0700)]
am
8bd04b20: Merge change Iea48361d into eclair
Merge commit '
8bd04b2000f418c8c6f4f628abc215bb5a688244' into eclair-plus-aosp
* commit '
8bd04b2000f418c8c6f4f628abc215bb5a688244':
fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug
2171204
Fred Quintana [Thu, 8 Oct 2009 07:54:41 +0000 (00:54 -0700)]
am
8bd04b20: Merge change Iea48361d into eclair
Merge commit '
8bd04b2000f418c8c6f4f628abc215bb5a688244' into eclair-mr2
* commit '
8bd04b2000f418c8c6f4f628abc215bb5a688244':
fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug
2171204
Android (Google) Code Review [Thu, 8 Oct 2009 07:50:07 +0000 (03:50 -0400)]
Merge change Iea48361d into eclair
* changes:
fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug
2171204
Dianne Hackborn [Thu, 8 Oct 2009 05:13:29 +0000 (22:13 -0700)]
am
8c815d9d: am
b134b203: Merge change Id8c9cb2f into eclair
Merge commit '
8c815d9dedc89fcf94c07b03bdf8b3a8ea33e240' into eclair-mr2-plus-aosp
* commit '
8c815d9dedc89fcf94c07b03bdf8b3a8ea33e240':
Dianne Hackborn [Thu, 8 Oct 2009 05:13:28 +0000 (22:13 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Dianne Hackborn [Thu, 8 Oct 2009 05:08:15 +0000 (22:08 -0700)]
am
b134b203: Merge change Id8c9cb2f into eclair
Merge commit '
b134b2038ecabcbec3f9b657834d45de27707068' into eclair-plus-aosp
* commit '
b134b2038ecabcbec3f9b657834d45de27707068':
More fix #
2163209: alarm clock rings but is hidden behind lock screen
Dianne Hackborn [Thu, 8 Oct 2009 05:07:54 +0000 (22:07 -0700)]
am
b134b203: Merge change Id8c9cb2f into eclair
Merge commit '
b134b2038ecabcbec3f9b657834d45de27707068' into eclair-mr2
* commit '
b134b2038ecabcbec3f9b657834d45de27707068':
More fix #
2163209: alarm clock rings but is hidden behind lock screen
Android (Google) Code Review [Thu, 8 Oct 2009 04:58:46 +0000 (00:58 -0400)]
Merge change Id8c9cb2f into eclair
* changes:
More fix #
2163209: alarm clock rings but is hidden behind lock screen
Dianne Hackborn [Thu, 8 Oct 2009 04:26:57 +0000 (21:26 -0700)]
More fix #
2163209: alarm clock rings but is hidden behind lock screen
There was another way we could ignore the application windows flags
while the lock screen was displayed. This is the infrastructure to
deal with that.
Change-Id: Id8c9cb2f7081df6757ccb797a7cde618e82f7b38
Dave Sparks [Thu, 8 Oct 2009 04:19:35 +0000 (21:19 -0700)]
am
ec83852a: am
281acf42: Merge change I52479480 into eclair
Merge commit '
ec83852a19771948ed1b6dd3af56e8439b747bf8' into eclair-mr2-plus-aosp
* commit '
ec83852a19771948ed1b6dd3af56e8439b747bf8':
Jason Sams [Thu, 8 Oct 2009 04:19:30 +0000 (21:19 -0700)]
am
48289b2e: am
7c12540f: Merge change Ibd2197fb into eclair
Merge commit '
48289b2e892cf55bf4bdc6163f8f4f0642eed9b9' into eclair-mr2-plus-aosp
* commit '
48289b2e892cf55bf4bdc6163f8f4f0642eed9b9':
Doug Zongker [Thu, 8 Oct 2009 04:19:24 +0000 (21:19 -0700)]
am
83b60080: am
9af53ea6: am
3161795b: when logging free space on /data, log /system and /cache as well
Merge commit '
83b600803cdbcb3f9788845c77e5c1d17bc36dd5' into eclair-mr2-plus-aosp
* commit '
83b600803cdbcb3f9788845c77e5c1d17bc36dd5':
Mathias Agopian [Thu, 8 Oct 2009 04:19:19 +0000 (21:19 -0700)]
am
e726f6e9: am
4ff6d01d: Merge change I46b2df15 into eclair
Merge commit '
e726f6e998b7f42dcc41bd2154c5fb3ddf5a5838' into eclair-mr2-plus-aosp
* commit '
e726f6e998b7f42dcc41bd2154c5fb3ddf5a5838':
Mathias Agopian [Thu, 8 Oct 2009 04:19:13 +0000 (21:19 -0700)]
am
3145c43d: am
c7141303: Merge change Id23b791a into eclair
Merge commit '
3145c43df468a7fa17ca1959a3c2b8a610c69604' into eclair-mr2-plus-aosp
* commit '
3145c43df468a7fa17ca1959a3c2b8a610c69604':
Grace Kloba [Thu, 8 Oct 2009 04:19:12 +0000 (21:19 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Dave Sparks [Thu, 8 Oct 2009 04:14:29 +0000 (21:14 -0700)]
am
281acf42: Merge change I52479480 into eclair
Merge commit '
281acf421f4b977add75d736d1083413e1d5f24a' into eclair-plus-aosp
* commit '
281acf421f4b977add75d736d1083413e1d5f24a':
Retry overlay create if it fails. Bug
2153980.
Dave Sparks [Thu, 8 Oct 2009 04:14:19 +0000 (21:14 -0700)]
am
281acf42: Merge change I52479480 into eclair
Merge commit '
281acf421f4b977add75d736d1083413e1d5f24a' into eclair-mr2
* commit '
281acf421f4b977add75d736d1083413e1d5f24a':
Retry overlay create if it fails. Bug
2153980.
Android (Google) Code Review [Thu, 8 Oct 2009 04:07:05 +0000 (00:07 -0400)]
Merge change I52479480 into eclair
* changes:
Retry overlay create if it fails. Bug
2153980.
Dave Sparks [Thu, 8 Oct 2009 02:18:20 +0000 (19:18 -0700)]
Retry overlay create if it fails. Bug
2153980.
Occasionally we see references to the overlay hanging around long
enough to cause problems in applications when they tried to destroy
the overlay and re-create it. This patch causes the camera HAL to
retry the overlay creation call if it fails every 20ms up to 50
times before it gives up.
Jason Sams [Thu, 8 Oct 2009 01:24:09 +0000 (18:24 -0700)]
am
7c12540f: Merge change Ibd2197fb into eclair
Merge commit '
7c12540f09659dec0a4222831ed7e5ab8d7b0cdf' into eclair-mr2
* commit '
7c12540f09659dec0a4222831ed7e5ab8d7b0cdf':
Add script to script call support. Add exception to catch out of bound index data when added to TriangleMeshBuilder.
Doug Zongker [Thu, 8 Oct 2009 01:24:03 +0000 (18:24 -0700)]
am
9af53ea6: am
3161795b: when logging free space on /data, log /system and /cache as well
Merge commit '
9af53ea6ef9a986bc65bcd11deb7994f1f4ba8ec' into eclair-mr2
* commit '
9af53ea6ef9a986bc65bcd11deb7994f1f4ba8ec':
when logging free space on /data, log /system and /cache as well
Jason Sams [Thu, 8 Oct 2009 01:22:11 +0000 (18:22 -0700)]
am
7c12540f: Merge change Ibd2197fb into eclair
Merge commit '
7c12540f09659dec0a4222831ed7e5ab8d7b0cdf' into eclair-plus-aosp
* commit '
7c12540f09659dec0a4222831ed7e5ab8d7b0cdf':
Add script to script call support. Add exception to catch out of bound index data when added to TriangleMeshBuilder.
Doug Zongker [Thu, 8 Oct 2009 01:22:05 +0000 (18:22 -0700)]
am
9af53ea6: am
3161795b: when logging free space on /data, log /system and /cache as well
Merge commit '
9af53ea6ef9a986bc65bcd11deb7994f1f4ba8ec' into eclair-plus-aosp
* commit '
9af53ea6ef9a986bc65bcd11deb7994f1f4ba8ec':
when logging free space on /data, log /system and /cache as well
Mathias Agopian [Thu, 8 Oct 2009 01:18:56 +0000 (18:18 -0700)]
am
4ff6d01d: Merge change I46b2df15 into eclair
Merge commit '
4ff6d01d42fce2dc52b2dec8f59b625b18770bb0' into eclair-mr2
* commit '
4ff6d01d42fce2dc52b2dec8f59b625b18770bb0':
fix [
2164183] sometimes device just wants to stay asleep
Mathias Agopian [Thu, 8 Oct 2009 01:18:50 +0000 (18:18 -0700)]
am
c7141303: Merge change Id23b791a into eclair
Merge commit '
c71413032e1ad1f166861a980d8547d4106f7fa0' into eclair-mr2
* commit '
c71413032e1ad1f166861a980d8547d4106f7fa0':
fix [
2170283] SurfaceFlinger crashes on OOM.
Android (Google) Code Review [Thu, 8 Oct 2009 01:18:01 +0000 (21:18 -0400)]
Merge change Ibd2197fb into eclair
* changes:
Add script to script call support. Add exception to catch out of bound index data when added to TriangleMeshBuilder.
Mathias Agopian [Thu, 8 Oct 2009 01:17:15 +0000 (18:17 -0700)]
am
4ff6d01d: Merge change I46b2df15 into eclair
Merge commit '
4ff6d01d42fce2dc52b2dec8f59b625b18770bb0' into eclair-plus-aosp
* commit '
4ff6d01d42fce2dc52b2dec8f59b625b18770bb0':
fix [
2164183] sometimes device just wants to stay asleep
Mathias Agopian [Thu, 8 Oct 2009 01:17:09 +0000 (18:17 -0700)]
am
c7141303: Merge change Id23b791a into eclair
Merge commit '
c71413032e1ad1f166861a980d8547d4106f7fa0' into eclair-plus-aosp
* commit '
c71413032e1ad1f166861a980d8547d4106f7fa0':
fix [
2170283] SurfaceFlinger crashes on OOM.
Doug Zongker [Thu, 8 Oct 2009 01:17:06 +0000 (18:17 -0700)]
am
3161795b: when logging free space on /data, log /system and /cache as well
Merge commit '
3161795b2353171bb0636fb3ea6dab7dec80a4f4' into eclair
* commit '
3161795b2353171bb0636fb3ea6dab7dec80a4f4':
when logging free space on /data, log /system and /cache as well
Jason Sams [Thu, 8 Oct 2009 01:14:01 +0000 (18:14 -0700)]
Add script to script call support. Add exception to catch out of bound index data when added to TriangleMeshBuilder.
Android (Google) Code Review [Thu, 8 Oct 2009 01:09:49 +0000 (21:09 -0400)]
Merge change I46b2df15 into eclair
* changes:
fix [
2164183] sometimes device just wants to stay asleep
Android (Google) Code Review [Thu, 8 Oct 2009 01:07:05 +0000 (21:07 -0400)]
Merge change Id23b791a into eclair
* changes:
fix [
2170283] SurfaceFlinger crashes on OOM.
Grace Kloba [Thu, 8 Oct 2009 01:06:27 +0000 (18:06 -0700)]
am
a921bf4e: Merge change I8f5e405f into eclair-mr2
Merge commit '
a921bf4e9ff32f4b561af077d11f5dc85ea67d33' into eclair-mr2-plus-aosp
* commit '
a921bf4e9ff32f4b561af077d11f5dc85ea67d33':
mGeolocationDatabasePath needs to compare mGeolocationDatabasePath
Mathias Agopian [Tue, 6 Oct 2009 22:58:44 +0000 (15:58 -0700)]
fix [
2170283] SurfaceFlinger crashes on OOM.
when running out of memory, a null handle is returned but the error code may not be set.
In that case we need to return NO_MEMORY instead of NO_ERROR, so that the calling code
won't try to dereference the null pointer.
Android (Google) Code Review [Thu, 8 Oct 2009 00:59:21 +0000 (20:59 -0400)]
Merge change I8f5e405f into eclair-mr2
* changes:
mGeolocationDatabasePath needs to compare mGeolocationDatabasePath
Mathias Agopian [Thu, 8 Oct 2009 00:58:29 +0000 (17:58 -0700)]
fix [
2164183] sometimes device just wants to stay asleep
When switching rapidily orientation back and forth, surfaces end-up
acquiring the freeze-lock when the first orientation change happens,
but never release it because by the time the 2nd orientation change
comes in, the surface size is back to its original size and
doesn't appear to have resized.
we now always release the freeze-lock when we receive a buffer of the
expected size.
Dianne Hackborn [Thu, 8 Oct 2009 00:55:40 +0000 (17:55 -0700)]
am
d78fbddd: am
568cae57: Fix issue #
2171460: Turn off background blurring of power dialog
Merge commit '
d78fbdddea1e0cbecfd0f209c09b6dd4ef56e7d4' into eclair-mr2-plus-aosp
* commit '
d78fbdddea1e0cbecfd0f209c09b6dd4ef56e7d4':
Dianne Hackborn [Thu, 8 Oct 2009 00:55:40 +0000 (17:55 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Daisuke Miyakawa [Thu, 8 Oct 2009 00:25:50 +0000 (17:25 -0700)]
Make vCard import Photo from vCard file :(
Internal issue number:
2174296
Dianne Hackborn [Thu, 8 Oct 2009 00:45:14 +0000 (17:45 -0700)]
am
568cae57: Fix issue #
2171460: Turn off background blurring of power dialog
Merge commit '
568cae571a3d74d1992176a21722e07b44e9a3c4' into eclair-mr2
* commit '
568cae571a3d74d1992176a21722e07b44e9a3c4':
Fix issue #
2171460: Turn off background blurring of power dialog
Dianne Hackborn [Thu, 8 Oct 2009 00:45:08 +0000 (17:45 -0700)]
am
568cae57: Fix issue #
2171460: Turn off background blurring of power dialog
Merge commit '
568cae571a3d74d1992176a21722e07b44e9a3c4' into eclair-plus-aosp
* commit '
568cae571a3d74d1992176a21722e07b44e9a3c4':
Fix issue #
2171460: Turn off background blurring of power dialog
Mathias Agopian [Thu, 8 Oct 2009 00:39:12 +0000 (17:39 -0700)]
am
18fc0120: am
a2de8e31: Merge change Ie05f07df into eclair
Merge commit '
18fc0120f59f179ab13adf9e122371f32f65a12c' into eclair-mr2-plus-aosp
* commit '
18fc0120f59f179ab13adf9e122371f32f65a12c':
Mike Cleron [Thu, 8 Oct 2009 00:39:12 +0000 (17:39 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Dianne Hackborn [Wed, 7 Oct 2009 23:13:39 +0000 (16:13 -0700)]
Fix issue #
2171460: Turn off background blurring of power dialog
Change-Id: I521629e0ccd0116acf149eeb7476c8474fc7c74a
Mathias Agopian [Thu, 8 Oct 2009 00:34:19 +0000 (17:34 -0700)]
am
a2de8e31: Merge change Ie05f07df into eclair
Merge commit '
a2de8e31c2693d009db1f9386406758874dd1d40' into eclair-plus-aosp
* commit '
a2de8e31c2693d009db1f9386406758874dd1d40':
fix [
2170319] gmail bulk operation checkbox latency on passion
Mathias Agopian [Thu, 8 Oct 2009 00:33:43 +0000 (17:33 -0700)]
am
a2de8e31: Merge change Ie05f07df into eclair
Merge commit '
a2de8e31c2693d009db1f9386406758874dd1d40' into eclair-mr2
* commit '
a2de8e31c2693d009db1f9386406758874dd1d40':
fix [
2170319] gmail bulk operation checkbox latency on passion
Android (Google) Code Review [Thu, 8 Oct 2009 00:25:08 +0000 (20:25 -0400)]
Merge change Ie05f07df into eclair
* changes:
fix [
2170319] gmail bulk operation checkbox latency on passion
Doug Zongker [Wed, 7 Oct 2009 22:14:03 +0000 (15:14 -0700)]
when logging free space on /data, log /system and /cache as well
Report space free on system and cache so we can estimate bad block
statistics for devices in the field.
Dmitri Plotnikov [Thu, 8 Oct 2009 00:12:54 +0000 (17:12 -0700)]
am
c38f6f33: am
c15934f2: Merge change I7a57637b into eclair
Merge commit '
c38f6f33011e5b3b2f947bf94d8b96b97e67128c' into eclair-mr2-plus-aosp
* commit '
c38f6f33011e5b3b2f947bf94d8b96b97e67128c':
Evan Millar [Thu, 8 Oct 2009 00:12:54 +0000 (17:12 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Dmitri Plotnikov [Thu, 8 Oct 2009 00:07:56 +0000 (17:07 -0700)]
am
c15934f2: Merge change I7a57637b into eclair
Merge commit '
c15934f26a235a8218f9f673ebf8227acccefff2' into eclair-plus-aosp
* commit '
c15934f26a235a8218f9f673ebf8227acccefff2':
[Issue
2165234] Removing nickname clusters: John/Jack and Patrick/Rick.
Dmitri Plotnikov [Thu, 8 Oct 2009 00:07:26 +0000 (17:07 -0700)]
am
c15934f2: Merge change I7a57637b into eclair
Merge commit '
c15934f26a235a8218f9f673ebf8227acccefff2' into eclair-mr2
* commit '
c15934f26a235a8218f9f673ebf8227acccefff2':
[Issue
2165234] Removing nickname clusters: John/Jack and Patrick/Rick.
Android (Google) Code Review [Wed, 7 Oct 2009 23:59:07 +0000 (19:59 -0400)]
Merge change I7a57637b into eclair
* changes:
[Issue
2165234] Removing nickname clusters: John/Jack and Patrick/Rick.
Mathias Agopian [Wed, 7 Oct 2009 23:44:10 +0000 (16:44 -0700)]
fix [
2170319] gmail bulk operation checkbox latency on passion
This also fixes [
2152536] ANR in browser
When SF is enqueuing buffers faster than SF dequeues them.
The update flag in SF is not counted and under some situations SF will only
dequeue the first buffer. The state at this point is not technically
corrupted, it's valid, but just delayed by one buffer.
In the case of the Browser ANR, because the last enqueued buffer was delayed
the resizing of the current buffer couldn't happen.
The system would always fall back onto its feet if anything -else- in
tried to draw, because the "late" buffer would be picked up then.
Nick Pelly [Wed, 7 Oct 2009 23:41:38 +0000 (16:41 -0700)]
am
d7ebc7a4: am
7a865a5d: Merge change Ieed8be00 into eclair
Merge commit '
d7ebc7a42d52063f731890f42206162c38702e0c' into eclair-mr2-plus-aosp
* commit '
d7ebc7a42d52063f731890f42206162c38702e0c':
Nick Pelly [Wed, 7 Oct 2009 23:41:37 +0000 (16:41 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Fred Quintana [Wed, 7 Oct 2009 23:36:48 +0000 (16:36 -0700)]
fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug
2171204
Nick Pelly [Wed, 7 Oct 2009 23:36:23 +0000 (16:36 -0700)]
am
7a865a5d: Merge change Ieed8be00 into eclair
Merge commit '
7a865a5de8214aa4975371b9d8a2165a01f6b69c' into eclair-plus-aosp
* commit '
7a865a5de8214aa4975371b9d8a2165a01f6b69c':
Introduce BluetoothAdapter.getDefaultAdapter().
Nick Pelly [Wed, 7 Oct 2009 23:36:15 +0000 (16:36 -0700)]
am
7a865a5d: Merge change Ieed8be00 into eclair
Merge commit '
7a865a5de8214aa4975371b9d8a2165a01f6b69c' into eclair-mr2
* commit '
7a865a5de8214aa4975371b9d8a2165a01f6b69c':
Introduce BluetoothAdapter.getDefaultAdapter().
Android (Google) Code Review [Wed, 7 Oct 2009 23:26:59 +0000 (19:26 -0400)]
Merge change Ieed8be00 into eclair
* changes:
Introduce BluetoothAdapter.getDefaultAdapter().
Dmitri Plotnikov [Wed, 7 Oct 2009 00:57:16 +0000 (17:57 -0700)]
[Issue
2165234] Removing nickname clusters: John/Jack and Patrick/Rick.
Also adding some nicknames from Mike Hearn's list.
Change-Id: I7a57637bbdc267816e5e063fce4d2ac6a3136284
Nick Pelly [Wed, 7 Oct 2009 22:12:45 +0000 (00:12 +0200)]
Introduce BluetoothAdapter.getDefaultAdapter().
This is the main entry point to the Bluetooth APIs, and returns the default
local Bluetooth adapter.
It replaces context.getSystemService(Context.BLUETOOTH_SERVICE). This was
never in a public SDK release.
DrNo: eastham
Bug:
2158765
Joke: Why can't you play cards in the jungle? Because there's too many cheetas!
Change-Id: Ieed8be009ee5aba621cb69090ee8c8a9c19c840d
Nick Pelly [Wed, 7 Oct 2009 22:18:10 +0000 (15:18 -0700)]
am
55a17d6e: am
dc2ccb82: Merge change Ia4879943 into eclair
Merge commit '
55a17d6e6d453715d137c63be17404e5c24d30f4' into eclair-mr2-plus-aosp
* commit '
55a17d6e6d453715d137c63be17404e5c24d30f4':