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 '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 '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
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
Follow up to bug 2195678. This was one of the reprocussions that
I was worried about with respect to that bug, so I'm counting
Dr. No on that change as the one for this one.
Merge commit 'cc1d35e2e5e0c2370361294a64ff0e580856b9d2' into eclair-mr2-plus-aosp
* commit 'cc1d35e2e5e0c2370361294a64ff0e580856b9d2':
Use setRepeating() rather than setInexactRepeating() for backup scheduling,
Merge commit 'afd81beb33cce3b296927d13821fe0dc874ce7db' into eclair-mr2
* commit 'afd81beb33cce3b296927d13821fe0dc874ce7db':
Use setRepeating() rather than setInexactRepeating() for backup scheduling,
* changes:
Use setRepeating() rather than setInexactRepeating() for backup scheduling, and add some random fuzz to the scheduling times, to make sure we aren't creating hour-aligned server load spikes.
Bug 2195678
We had all this stuff there to keep the notification view
around so it doesn't need to be reconstructed each time,
and we weren't using it. This fixes that, and it looks
much better now.
Merge commit 'e94261b874b7d0704dade14540dbb9477a828163' into eclair-mr2-plus-aosp
* commit 'e94261b874b7d0704dade14540dbb9477a828163':
Fix problem with proximity sensor not reawaking screen if the values change too quickly.
Merge commit '989b76aadd92538c7ab4ca00c34508b42fda8cef' into eclair-mr2
* commit '989b76aadd92538c7ab4ca00c34508b42fda8cef':
Fix problem with proximity sensor not reawaking screen if the values change too quickly.
The logic that disables user activity while turning off the screen should not affect proximity sensor.
Fixes bug b/2228734 (in-call, prox sensor gets confused)
Change-Id: Ieca126e6f79bf7baa5741981aea72d306ba03edc
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'b2346324e5f6062fed7bdeaedb9cf968b05050ec' into eclair-mr2-plus-aosp
* commit 'b2346324e5f6062fed7bdeaedb9cf968b05050ec':
Do not advance mLastEventTime when enabling or disabling user activity.
Merge commit 'f1d14f6a33bc6086db52a77b6a1217452b7eac90' into eclair-mr2
* commit 'f1d14f6a33bc6086db52a77b6a1217452b7eac90':
Do not advance mLastEventTime when enabling or disabling user activity.
Fixes a race condition between the keyguard and power key that sometimes resulted
in the power key failing to turn off the screen.
Fixes bug b/2212852 (Power button does not put phone to sleep)
Change-Id: I92498c5fddf2bfc32b105ea1a7ea14a06d83888e
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'f20555706c81dcb9fcb1fee9ce263072cd77ea3c' into eclair-mr2-plus-aosp
* commit 'f20555706c81dcb9fcb1fee9ce263072cd77ea3c':
Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
Merge commit 'f6fc41314d253962720b2c75f3a64025037acf0e' into eclair-mr2-plus-aosp
* commit 'f6fc41314d253962720b2c75f3a64025037acf0e':
Manage button and keyboard backlights with light sensor in both manual and automatic mode.
