TokenWatcher.acquire() synchronizes on mTokens, not this,
so we need to synchronize on mKeyguardDisabled in disableKeyguard()
to synchronize properly with reenableKeyguard().
This should fix b/2180142 (Stuck in enable keyguard when receiving phone call)
Change-Id: Iad66a2748c7fbf2c516fdb8a00988696719ea80c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e' into eclair-plus-aosp
* commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e':
Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Merge commit 'ee110be02256b816ac6d863e39cb8b11b8071baa' into eclair-plus-aosp
* commit 'ee110be02256b816ac6d863e39cb8b11b8071baa':
Fix issue #2179891: Need to update 5.xml
The dock app is forcing the screen to a particular brightness level. This
causes the window manager to often call into the power manager with the
new brightness. This causes us to go in to updateLightsLocked() to figure
out and apply the real brightness to use. When the screen is off the
real brightness always remains 0, but even if it didn't change from the
last one we would start an animation which would when done put the system
to sleep and fight with the user trying to turn the device on.
Now, if the new target brightness is the same as the last one, we leave the
animation as-is -- either running or not as appropriate.
Change-Id: I067d55ea2b39e294c5d5291587a4d8727c0b8083
Merge commit 'c08efb2712fbcc25ce9c208f3c9d7c0935e209d4' into eclair-plus-aosp
* commit 'c08efb2712fbcc25ce9c208f3c9d7c0935e209d4':
Import revised translations. DO NOT MERGE
Merge commit '98e0b146b80670b52805b4b210ef5582dad6bb68' into eclair-plus-aosp
* commit '98e0b146b80670b52805b4b210ef5582dad6bb68':
Make PhoneStateListeners not call TelephonyManager
Since the StatusBarPolicy is run in the System Process and shouldn't therefore call into
the Telephony process we decided to make sure all the needed info was passed along with the
original notifications.
bug: 2173053
Merge commit '6903d5cedcffa005818c497f672cf16c2dff619c' into eclair-plus-aosp
* commit '6903d5cedcffa005818c497f672cf16c2dff619c':
Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
Merge commit 'ad60e7fe2c9588cd16c1351419af90964beb232d' into eclair-plus-aosp
* commit 'ad60e7fe2c9588cd16c1351419af90964beb232d':
Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
Merge commit '2c6c5e6e49795e6e24cd089c9018377d837ba931' into eclair-plus-aosp
* commit '2c6c5e6e49795e6e24cd089c9018377d837ba931':
Fix issue #2176944: Need API so browser, others can determine memory size of device
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.
