OSDN Git Service
John Wang [Fri, 9 Oct 2009 00:53:06 +0000 (17:53 -0700)]
am
2d4b58f2: am
33e21fcc: Control H icon display in Status bar.
Merge commit '
2d4b58f29eda24fe5ec1dd1850823a9e7bddacc6' into eclair-mr2-plus-aosp
* commit '
2d4b58f29eda24fe5ec1dd1850823a9e7bddacc6':
Romain Guy [Fri, 9 Oct 2009 00:53:00 +0000 (17:53 -0700)]
am
94ee9260: am
3b36ed09: Merge change I95319bde into eclair
Merge commit '
94ee92600a13f4d58afa61215c69fb60b989f6f3' into eclair-mr2-plus-aosp
* commit '
94ee92600a13f4d58afa61215c69fb60b989f6f3':
Daisuke Miyakawa [Fri, 9 Oct 2009 00:52:54 +0000 (17:52 -0700)]
am
bd3d5b25: am
387e73bd: Merge change Ib977f2bd into eclair
Merge commit '
bd3d5b25bff3504b4158dade39dc2384d7aeb77a' into eclair-mr2-plus-aosp
* commit '
bd3d5b25bff3504b4158dade39dc2384d7aeb77a':
Eric Fischer [Fri, 9 Oct 2009 00:52:53 +0000 (17:52 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
John Wang [Fri, 9 Oct 2009 00:30:12 +0000 (17:30 -0700)]
am
33e21fcc: Control H icon display in Status bar.
Merge commit '
33e21fcc99dd91061ea245984c4e9a1544cb943f' into eclair-mr2
* commit '
33e21fcc99dd91061ea245984c4e9a1544cb943f':
Control H icon display in Status bar.
Romain Guy [Fri, 9 Oct 2009 00:29:39 +0000 (17:29 -0700)]
am
3b36ed09: Merge change I95319bde into eclair
Merge commit '
3b36ed09293965e7e5dc20dfa514422388e796d6' into eclair-mr2
* commit '
3b36ed09293965e7e5dc20dfa514422388e796d6':
Fixes #
2175599. Prevents an NPE when AttachInfo is null.
Daisuke Miyakawa [Fri, 9 Oct 2009 00:29:32 +0000 (17:29 -0700)]
am
387e73bd: Merge change Ib977f2bd into eclair
Merge commit '
387e73bd8fbecae0b95e3005ca8187ddbda1aff7' into eclair-mr2
* commit '
387e73bd8fbecae0b95e3005ca8187ddbda1aff7':
Make vCard import Photo from vCard file :(
Dianne Hackborn [Thu, 8 Oct 2009 23:58:20 +0000 (16:58 -0700)]
am
9e2562b8: Merge change I88c6e267 into eclair
Merge commit '
9e2562b8f97fec7e13e6302678459e99b8cccb2a' into eclair-plus-aosp
* commit '
9e2562b8f97fec7e13e6302678459e99b8cccb2a':
Fix issue #
2175693: Add vmallocinfo to dumpstate
Android (Google) Code Review [Thu, 8 Oct 2009 23:52:35 +0000 (19:52 -0400)]
Merge change I88c6e267 into eclair
* changes:
Fix issue #
2175693: Add vmallocinfo to dumpstate
Nick Pelly [Thu, 8 Oct 2009 23:47:19 +0000 (16:47 -0700)]
am
db7ae10d: Remove STOPSHIP BT logging.
Merge commit '
db7ae10d6b8e86ff5311512de45afa65a1b0a738' into eclair-plus-aosp
* commit '
db7ae10d6b8e86ff5311512de45afa65a1b0a738':
Remove STOPSHIP BT logging.
Nick Pelly [Thu, 8 Oct 2009 23:47:13 +0000 (16:47 -0700)]
am
e6ee3be1: BT API security audit: fix a couple of permission mistakes.
Merge commit '
e6ee3be1c254404dad842298f6f56c11cc6c7ac8' into eclair-plus-aosp
* commit '
e6ee3be1c254404dad842298f6f56c11cc6c7ac8':
BT API security audit: fix a couple of permission mistakes.
Nick Pelly [Thu, 8 Oct 2009 22:54:41 +0000 (00:54 +0200)]
Remove STOPSHIP BT logging.
Do not merge.
Change-Id: I428bc0fc67030f24112f2e9c865824dfaea4897d
DrNo: eastham
Bug:
2089423
Joke: Why was Tigger looking in the toilet? To find Pooh
Nick Pelly [Thu, 8 Oct 2009 21:27:28 +0000 (23:27 +0200)]
BT API security audit: fix a couple of permission mistakes.
Make functions that are meant to be BLUETOOTH_ADMIN really
BLUETOOTH_ADMIN.
Add some missing javadoc for permissions.
The only functional change here is the BLUETOOTH->BLUETOOTH_ADMIN
changes. This is super safe because every system app that uses BT
has both permissions.
Change-Id: Iddc61f9fd5d81fe0171358665a0fa52f2fa02871
DrNo: eastham
Joke: How do you catch a rabbit? Hide behind a tree and make carrott noises.
Dianne Hackborn [Thu, 8 Oct 2009 17:49:12 +0000 (10:49 -0700)]
Fix issue #
2175693: Add vmallocinfo to dumpstate
Change-Id: I88c6e2679919e56f581fcf79dbe683393dd8ce27
Mathias Agopian [Thu, 8 Oct 2009 23:20:45 +0000 (16:20 -0700)]
am
846322a9: Merge change Ib96df854 into eclair
Merge commit '
846322a9ae5ef8155cca0059d3f64d718516ca13' into eclair-plus-aosp
* commit '
846322a9ae5ef8155cca0059d3f64d718516ca13':
add a way to easily catch and log GL errors (compile time flag)
Android (Google) Code Review [Thu, 8 Oct 2009 23:10:42 +0000 (19:10 -0400)]
Merge change Ib96df854 into eclair
* changes:
add a way to easily catch and log GL errors (compile time flag)
Mathias Agopian [Thu, 8 Oct 2009 22:58:11 +0000 (15:58 -0700)]
add a way to easily catch and log GL errors (compile time flag)
Eric Fischer [Thu, 8 Oct 2009 22:10:38 +0000 (15:10 -0700)]
am
aaa6299b: am
24c8645a: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
aaa6299bcd1a44f5f066ef48fb99cc0a704cbd0f' into eclair-plus-aosp
* commit '
aaa6299bcd1a44f5f066ef48fb99cc0a704cbd0f':
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Thu, 8 Oct 2009 22:10:32 +0000 (15:10 -0700)]
am
ea110274: am
ac62c84a: (-s ours) DO NOT MERGE merge from donut-gms
Merge commit '
ea11027401a6b0e8fc351b7585d929e8fdb3fd08' into eclair-plus-aosp
* commit '
ea11027401a6b0e8fc351b7585d929e8fdb3fd08':
Import revised translations. DO NOT MERGE
Mike Lockwood [Thu, 8 Oct 2009 22:10:25 +0000 (15:10 -0700)]
am
348b92bd: Merge change Iee227ace into eclair
Merge commit '
348b92bd513087369ac682e29620d7829fa1381b' into eclair-plus-aosp
* commit '
348b92bd513087369ac682e29620d7829fa1381b':
GPS: Fix problem with SUPL when SUPL APN is already active.
Eric Fischer [Thu, 8 Oct 2009 22:03:24 +0000 (15:03 -0700)]
am
24c8645a: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
24c8645a995f58885fefcaade0681dd459452deb' into eclair
* commit '
24c8645a995f58885fefcaade0681dd459452deb':
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Thu, 8 Oct 2009 22:03:15 +0000 (15:03 -0700)]
am
ac62c84a: (-s ours) DO NOT MERGE merge from donut-gms
Merge commit '
ac62c84a321e2720ab99e37724aba0b6406f39a6' into eclair
* commit '
ac62c84a321e2720ab99e37724aba0b6406f39a6':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Thu, 8 Oct 2009 21:58:11 +0000 (17:58 -0400)]
Merge change Iee227ace into eclair
* changes:
GPS: Fix problem with SUPL when SUPL APN is already active.
Eric Laurent [Thu, 8 Oct 2009 21:47:26 +0000 (14:47 -0700)]
am
ff94720b: Merge change I80a6a229 into eclair
Merge commit '
ff94720b8bf9f83f326197cb0cb27576168e9448' into eclair-plus-aosp
* commit '
ff94720b8bf9f83f326197cb0cb27576168e9448':
Fix issue
2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
Andreas Huber [Thu, 8 Oct 2009 21:39:12 +0000 (14:39 -0700)]
am
2d295a96: Merge change Iedebfe8d into eclair-mr2
Merge commit '
2d295a9601315a2610a2cb759ed9a4f787e7d4b5' into eclair-mr2-plus-aosp
* commit '
2d295a9601315a2610a2cb759ed9a4f787e7d4b5':
Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
Robert Greenwalt [Thu, 8 Oct 2009 21:38:59 +0000 (14:38 -0700)]
am
c33623a0: Merge change Iba087ecc into eclair-mr2
Merge commit '
c33623a02483e0fa271f4da6c1d38ba9becfe0c2' into eclair-mr2-plus-aosp
* commit '
c33623a02483e0fa271f4da6c1d38ba9becfe0c2':
Make FWK start a wifi scan if supplicant forgets.
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:36:18 +0000 (17:36 -0400)]
Merge change I80a6a229 into eclair
* changes:
Fix issue
2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
Mike Lockwood [Thu, 8 Oct 2009 19:45:03 +0000 (15:45 -0400)]
GPS: Fix problem with SUPL when SUPL APN is already active.
Use ConnectivityManager.CONNECTIVITY_ACTION broadcast in LocationManagerService
to notify GPS when SUPL connection is ready instead of TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED,
which is not sent in all cases.
Expand LocationProvider.updateNetworkState() to include NetworkInfo object.
Fixes bug b/
2155661
Change-Id: Iee227ace7d536b36cf7973e3e6a8b7a621ce6565
Signed-off-by: Mike Lockwood <lockwood@android.com>
Android (Google) Code Review [Thu, 8 Oct 2009 21:23:21 +0000 (17:23 -0400)]
Merge change Iedebfe8d into eclair-mr2
* changes:
Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
Andreas Huber [Thu, 8 Oct 2009 18:02:27 +0000 (11:02 -0700)]
Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
Android (Google) Code Review [Thu, 8 Oct 2009 21:21:07 +0000 (17:21 -0400)]
Merge change Iba087ecc into eclair-mr2
* changes:
Make FWK start a wifi scan if supplicant forgets.
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.
Robert Greenwalt [Thu, 8 Oct 2009 00:57:49 +0000 (17:57 -0700)]
Make FWK start a wifi scan if supplicant forgets.
Waits 15sec after getting a DISCONNECTED or INACTIVE state. Also tracks
the number of supplicant state transitions. After the period is up
if we haven't received any more supplicant state transitions, it requests a scan.
bug:
2168081
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.
Eric Fischer [Thu, 8 Oct 2009 19:16:00 +0000 (12:16 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I70d32c0d002d1ba3d08813c1e8985421fca81790
Eric Laurent [Thu, 8 Oct 2009 17:58:19 +0000 (10:58 -0700)]
Fix issue
2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
Added a workarouond to request the A2DP output standby directly to audio hardware when the sink is suspended as it seems that the suspend request often fails.
Also take into account resume requests received while a suspend request is pending.
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
Jean-Baptiste Queru [Thu, 8 Oct 2009 17:00:40 +0000 (10:00 -0700)]
DO NOT MERGE merge from donut-gms
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.