Merge commit 'eb44da5077ae21571f39bae86d6be49b74c68e24' into eclair-mr2
* commit 'eb44da5077ae21571f39bae86d6be49b74c68e24':
Cherry-pick from mr2 to eclair: DO NOT MERGE
commit 149c0543a3d5f450686b7c3d142ac5f8fcf61ed4
BUG=2176949
Partial fix for 2069703: Fix race condition in KeyguardViewManager.hide() that could result in a blank screen.
This fixes a race condition seen whenever show() is called before the timer in hide() triggers. This can happen
for example if the user hits "Emergency Dial" followed by the back button before the 0.5s timeout completes. The result
is a blank screen with no keyguard view and no means to recover on devices w/o a keyboard.
The bug caused us to sometimes remove the newly created KeyguardView instead of the old one, leaving the view empty.
The fix is to always remove the last view.
Merge commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8' into eclair-mr2
* commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8':
BT API security audit: fix a couple of permission mistakes.
Merge commit '846322a9ae5ef8155cca0059d3f64d718516ca13' into eclair-mr2
* commit '846322a9ae5ef8155cca0059d3f64d718516ca13':
add a way to easily catch and log GL errors (compile time flag)
Merge commit 'aaa6299bcd1a44f5f066ef48fb99cc0a704cbd0f' into eclair-mr2
* commit 'aaa6299bcd1a44f5f066ef48fb99cc0a704cbd0f':
Import revised translations. DO NOT MERGE
Merge commit 'ea11027401a6b0e8fc351b7585d929e8fdb3fd08' into eclair-mr2
* commit 'ea11027401a6b0e8fc351b7585d929e8fdb3fd08':
Import revised translations. DO NOT MERGE
Merge commit '348b92bd513087369ac682e29620d7829fa1381b' into eclair-mr2
* commit '348b92bd513087369ac682e29620d7829fa1381b':
GPS: Fix problem with SUPL when SUPL APN is already active.
Merge commit 'ff94720b8bf9f83f326197cb0cb27576168e9448' into eclair-mr2
* commit 'ff94720b8bf9f83f326197cb0cb27576168e9448':
Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
Merge commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa' into eclair-mr2
* commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa':
Set the Bond State to NONE when we receive a Agent Cancel.
Merge commit '33e21fcc99dd91061ea245984c4e9a1544cb943f' into eclair-mr2
* commit '33e21fcc99dd91061ea245984c4e9a1544cb943f':
Control H icon display in Status bar.
Merge commit 'f184c68119489aa00eccba41d3babedce282518b' into eclair-mr2
* commit 'f184c68119489aa00eccba41d3babedce282518b':
Ignore requests to hide the keyguard if we are in the process of waking up.
Merge commit '3b36ed09293965e7e5dc20dfa514422388e796d6' into eclair-mr2
* commit '3b36ed09293965e7e5dc20dfa514422388e796d6':
Fixes#2175599. Prevents an NPE when AttachInfo is null.
Merge commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8' into eclair-plus-aosp
* commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8':
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.
- Don't crash if the service's app process doesn't have a thread (this
can happen if we are currently starting the process and then try to
start the service again).
- Be more robust about deciding to start a service's process: try each
time it is started; the startProcess call will take care of ignoring
it if the process is already started.
- Fix some issues where we would leave dead processes on the low memory
list.
Change-Id: I490e01ba7b45adc191bab7ace377b6873e284897
Merge commit '846322a9ae5ef8155cca0059d3f64d718516ca13' into eclair-plus-aosp
* commit '846322a9ae5ef8155cca0059d3f64d718516ca13':
add a way to easily catch and log GL errors (compile time flag)
Merge commit 'aaa6299bcd1a44f5f066ef48fb99cc0a704cbd0f' into eclair-plus-aosp
* commit 'aaa6299bcd1a44f5f066ef48fb99cc0a704cbd0f':
Import revised translations. DO NOT MERGE
Merge commit 'ea11027401a6b0e8fc351b7585d929e8fdb3fd08' into eclair-plus-aosp
* commit 'ea11027401a6b0e8fc351b7585d929e8fdb3fd08':
Import revised translations. DO NOT MERGE
Merge commit '348b92bd513087369ac682e29620d7829fa1381b' into eclair-plus-aosp
* commit '348b92bd513087369ac682e29620d7829fa1381b':
GPS: Fix problem with SUPL when SUPL APN is already active.
Merge commit '24c8645a995f58885fefcaade0681dd459452deb' into eclair
* commit '24c8645a995f58885fefcaade0681dd459452deb':
Import revised translations. DO NOT MERGE
Merge commit 'ac62c84a321e2720ab99e37724aba0b6406f39a6' into eclair
* commit 'ac62c84a321e2720ab99e37724aba0b6406f39a6':
Import revised translations. DO NOT MERGE
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.
