Merge commit 'f57f147bfd5d6f7530a938d2e05fc7d68f7343c3' into kraken
* commit 'f57f147bfd5d6f7530a938d2e05fc7d68f7343c3':
add droiddoc flag to include since-tags for api level 8
Merge commit '5ce309d32e9aa28af4d2a6523ba2a4bc8e6d2f53' into froyo-plus-aosp
* commit '5ce309d32e9aa28af4d2a6523ba2a4bc8e6d2f53':
add droiddoc flag to include since-tags for api level 8
Merge commit '66fa5cc73dd20e8656c478e95f07798d8e20b44a' into kraken
* commit '66fa5cc73dd20e8656c478e95f07798d8e20b44a':
Force redraw in touch_up if there is a move.
Merge commit '99c5179fafcccff2bcc05b4c7fb04007bb438f67' into froyo-plus-aosp
* commit '99c5179fafcccff2bcc05b4c7fb04007bb438f67':
Force redraw in touch_up if there is a move.
The value returned is purely a function of what's passed in, all
following final members.
BUG=2606839
Change-Id: I506fb9b1f3be965576c2b3317a30ff1f990ccda3
Merge commit '9a9b09f6bd209f9f46370c63cb72ab3460216b3b' into kraken
* commit '9a9b09f6bd209f9f46370c63cb72ab3460216b3b':
Ease contention on the mProcessStatsThread mutex in updateCpuStats.
Merge commit 'afbf9f8d6d66a0c1ba8c44a87b120bcad89ad8b5' into froyo-plus-aosp
* commit 'afbf9f8d6d66a0c1ba8c44a87b120bcad89ad8b5':
Ease contention on the mProcessStatsThread mutex in updateCpuStats.
Merge commit 'e77bba8f2b67508fc6d4aa7b0054829c2d49965a' into kraken
* commit 'e77bba8f2b67508fc6d4aa7b0054829c2d49965a':
Reset notification state on wifi enable
Merge commit '1892013643537f5fc330f5b0a02a0e9cb08b1134' into froyo-plus-aosp
* commit '1892013643537f5fc330f5b0a02a0e9cb08b1134':
Reset notification state on wifi enable
Merge commit '6aa2accae3f58e4139f890f51c699901ee3abb88' into kraken
* commit '6aa2accae3f58e4139f890f51c699901ee3abb88':
Fix bug 2599698 Music paused by itself
Merge commit '04152f98ffbd17f54a6b771636ff7f440f0edc78' into froyo-plus-aosp
* commit '04152f98ffbd17f54a6b771636ff7f440f0edc78':
Fix bug 2599698 Music paused by itself
Merge commit 'daa107c81db31b7fbaaf4219b0552ff07d44a29e' into kraken
* commit 'daa107c81db31b7fbaaf4219b0552ff07d44a29e':
Fix inconsistency in how we handle light sensor when battery is low.
Merge commit '3110bf6df1cb6d548e678cdcbb8c7349b2ac0d8a' into froyo-plus-aosp
* commit '3110bf6df1cb6d548e678cdcbb8c7349b2ac0d8a':
Fix inconsistency in how we handle light sensor when battery is low.
Merge commit 'c2093636db6141426ca7fe88f07b30a284e36759' into kraken
* commit 'c2093636db6141426ca7fe88f07b30a284e36759':
Make ThrottleService more tamper resistant.
Merge commit '7171ea8179e09270e4d6ab825a2320816eee39c5' into froyo-plus-aosp
* commit '7171ea8179e09270e4d6ab825a2320816eee39c5':
Make ThrottleService more tamper resistant.
Use elapsed time not wall time for alarms so users can't play with the
system time to get around things.
Also using NTP servers to pull in an authoritative time - if we the build
is configured with an NTP server we will not advance to the next cycle
without it, but we also will not trottle - rather not throttle users
on an error.
Note that the poll alarm is just relative to the last poll time and real
time doesn't matter.
Defining the time-fetching API's as returning time in the system wallclock
range (correcting if we are using NTP time internally).
bug:2597530
Change-Id: I1c0ac0923314c2f8a04edd0b36c4845352eae99a
In lightSensorChangedLocked we ignore the light sensor if the battery is low.
But in applyButtonState() and applyKeyboardState() we were still using the previous
mLightSensorScreenBrightness value, which resulted in a race condition that could
leave the button lights on after the screen turns off.
Now we ignore the light sensor value and button brightness override if the battery
is low so the low battery behavior is consistent.
Change-Id: I4943f8904299883211a95596ee207df69d1eaea2
BUG: 2570962
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '2572b046d64a2d0b43d74870e1e899364f2bc721' into kraken
* commit '2572b046d64a2d0b43d74870e1e899364f2bc721':
Dont check on interface value on API
Merge commit '975d86dfc6407314491a18bc715c8c95a8f8f0b1' into froyo-plus-aosp
* commit '975d86dfc6407314491a18bc715c8c95a8f8f0b1':
Dont check on interface value on API
Merge commit '17e36d233dff7178e60d841a650d9bef5d0af93c' into kraken
* commit '17e36d233dff7178e60d841a650d9bef5d0af93c':
Missed a case to resumeUpdatePicture.
The NotificationPlayer sets an OnCompletionListener on the
MediaPlayer it's using to play the notification.
NotificationPlayer relies on the completion event to abandon
audio focus.
The player was started before the listener was set. The theory
about the bug is that the player finished playing before the listener
was called. Therefore the audio focus was never abandonned, and
the music didn't resume.
Change-Id: Ic3baf359ea24de0d832a655dc47e745b25bc3dec
