Merge commit '0d72f7e9fc0d6f774eda5758d111bec5608bcf42' into eclair-mr2
* commit '0d72f7e9fc0d6f774eda5758d111bec5608bcf42':
Fix a race condition that could result in the screen being forced off indefinitely after a phone call.
Merge commit '0d72f7e9fc0d6f774eda5758d111bec5608bcf42' into eclair-plus-aosp
* commit '0d72f7e9fc0d6f774eda5758d111bec5608bcf42':
Fix a race condition that could result in the screen being forced off indefinitely after a phone call.
This should fix a "black screen" bug that Motorola identified.
mProximitySensorActive was being set to true due to a proximity sensor change being posted
just after we disabled the proximity sensor.
Now we ignore proximity changes after the phone app releases the proximity lock after the call is done.
Change-Id: I417d423de3d43515389b1b7b008cdcb795cd10f6
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '750e82e51921428dc4ad9a75f18b02b8048734d8' into eclair-mr2-plus-aosp
* commit '750e82e51921428dc4ad9a75f18b02b8048734d8':
When tasks are moved to top or bottom, the app tokens are being rearranged.
Merge commit 'bf50200ba494db0ac2ce655a95f76640f49355ee' into eclair-mr2
* commit 'bf50200ba494db0ac2ce655a95f76640f49355ee':
When tasks are moved to top or bottom, the app tokens are being rearranged.
Merge commit 'bf50200ba494db0ac2ce655a95f76640f49355ee' into eclair-plus-aosp
* commit 'bf50200ba494db0ac2ce655a95f76640f49355ee':
When tasks are moved to top or bottom, the app tokens are being rearranged.
Merge commit 'b31174de6a3d5ba39ccea02c9b653ea4f950bb89' into eclair-mr2-plus-aosp
* commit 'b31174de6a3d5ba39ccea02c9b653ea4f950bb89':
Throttle proximity sensor values so we do not process more than one change a second.
Merge commit '9ce3df55bab12bea563faf764f7beb3555d5942c' into eclair-mr2
* commit '9ce3df55bab12bea563faf764f7beb3555d5942c':
Throttle proximity sensor values so we do not process more than one change a second.
The window token rearrangement is defered if an animation is
underway. Force a focus recomputation when the window tokens are finally
rearranged so that we have a valid focused window.
Merge commit '9ce3df55bab12bea563faf764f7beb3555d5942c' into eclair-plus-aosp
* commit '9ce3df55bab12bea563faf764f7beb3555d5942c':
Throttle proximity sensor values so we do not process more than one change a second.
Merge commit '7b2aa74f4644979acea456e1047c96e17e09bc6d' into eclair-mr2-plus-aosp
* commit '7b2aa74f4644979acea456e1047c96e17e09bc6d':
Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn
Merge commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e' into eclair-mr2
* commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e':
Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn
Merge commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e' into eclair-plus-aosp
* commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e':
Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn
This is to prevent a noisy proximity sensor from causing the screen to turn on and off
in rapid succession, which can trigger race conditions in the keyguard manager.
Change-Id: I2c6e54e4b41716e038854ed9a827c901579c8865
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '76922b8378f235e79fd861ba846bed833199e59f' into eclair-mr2-plus-aosp
* commit '76922b8378f235e79fd861ba846bed833199e59f':
Add support for colored LED on jogball backlight.
Merge commit '9053fdb32b38d1240d856bd6efedf72eefba48d3' into eclair-mr2
* commit '9053fdb32b38d1240d856bd6efedf72eefba48d3':
Add support for colored LED on jogball backlight.
Merge commit '9053fdb32b38d1240d856bd6efedf72eefba48d3' into eclair-plus-aosp
* commit '9053fdb32b38d1240d856bd6efedf72eefba48d3':
Add support for colored LED on jogball backlight.
Merge commit '888b702c81b21847b19c4e2845686ed35cc03a0e' into eclair-mr2-plus-aosp
* commit '888b702c81b21847b19c4e2845686ed35cc03a0e':
Fix#2176803 - restores from userdebug to user builds not working
Merge commit '595596fe6b6fd52bf26d224f18b8724a4d151316' into eclair-mr2
* commit '595596fe6b6fd52bf26d224f18b8724a4d151316':
Fix#2176803 - restores from userdebug to user builds not working
Merge commit '595596fe6b6fd52bf26d224f18b8724a4d151316' into eclair-plus-aosp
* commit '595596fe6b6fd52bf26d224f18b8724a4d151316':
Fix#2176803 - restores from userdebug to user builds not working
The underlying issue is that ordinarily, the restore mechanism checks the
signature block of the package which uploaded the restore data against the
signature of the package on-device that will be handling the restore. This is
to ensure that the restore goes to the "same" application as the one that
uploaded it.
However, applications bundled on the system partition as part of the device
build are signed not with a permanent, app-identifying signature, but rather
with the device's signature block, which is different for each kind of device
and potentially between kinds of build for the same device. That renders the
stored backup data unusable when changing devices / builds / etc.
This change works around the problem by explicitly privileging applications that
reside on the system partition: they have been built into the device, and so
are trusted to be able to handle data that is marked as coming from its package
name.
Change-Id: I561011bce2b54cff3e695e82e7544b126b6ac31e
