Merge commit 'd8f34720a1eb87770c854928410c753e0969d3ac' into kraken
* commit 'd8f34720a1eb87770c854928410c753e0969d3ac':
Fix issue #2641875: Apps on sdcard not accesible after update
Merge commit 'c956f37567593a71271bae107eafec47575f7dcc' into froyo-plus-aosp
* commit 'c956f37567593a71271bae107eafec47575f7dcc':
Fix issue #2641875: Apps on sdcard not accesible after update
Not complete, only for experimentation at this point.
This includes a reworking of how screen size configurations are matched,
so that if you are on a larger screen we can select configurations for
smaller screens if there aren't any exactly matching the current screen.
The screen size at which we switch to xlarge has been arbitrarily
chosen; the compatibility behavior has not yet been defined.
Change-Id: I1a33b3818eeb51a68fb72397568c39ab040a07f5
Merge commit '087b25f7e2669497cf217d873437e8726c139abd' into kraken
* commit '087b25f7e2669497cf217d873437e8726c139abd':
Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681
Merge commit '6e4895b63aa64a8df64dd69c49a414b7566932d3' into froyo-plus-aosp
* commit '6e4895b63aa64a8df64dd69c49a414b7566932d3':
Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681
The SimpleDateFormat was being cached and new timezone not being applied. Make sure
to apply the new timezone to the format object as soon as it changes.
Change-Id: I72abfef2e14cf5db5a6e8cb71b053380b695495c
Merge commit '8f36a744bc8933396f237fbda8f21c31ed41d504' into kraken
* commit '8f36a744bc8933396f237fbda8f21c31ed41d504':
Fix bug 2605504 Don't leak a metric ton of NotificationPlayer threads
Merge commit 'cd24dae9ca6550b24333f889935e1de068759ce5' into froyo-plus-aosp
* commit 'cd24dae9ca6550b24333f889935e1de068759ce5':
Fix bug 2605504 Don't leak a metric ton of NotificationPlayer threads
The Looper on the thread created in order to be notified of the
playback completion of notification sounds, was never stopped, causing
the threads to stay around in wait state.
The fix consists in quitting the Looper used for the previous sound
when a new sound is started.
Change-Id: Ia4b3d16b5447ffafacc093db3a7fe05574089935
The start and end times were precisely the same so, a ">" check needed to be ">=".
Also removed useless code and removed the potential problem where continuous gradual
advancement of your start and end times would prevent resets.
bug:2629717
Change-Id: Ieced1965a5611a9b555e92bcf924ec350f2a80db
Merge commit '0ff9212d077e77f8b3e0afa232293306c0f72d07' into kraken
* commit '0ff9212d077e77f8b3e0afa232293306c0f72d07':
Handle throttling being disabled via policy change
Merge commit '19681af44b7c7494ae8de28dab8aacc3e9d92390' into froyo-plus-aosp
* commit '19681af44b7c7494ae8de28dab8aacc3e9d92390':
Handle throttling being disabled via policy change
Fixed public.xml value padding for kraken/master
Merge commit '81cd2e90' into manualmerge
Conflicts:
api/current.xml
Change-Id: I09d2c5c7e6acbf4086c0bb8756a5aaf41a646d71
Merge commit 'cdf96f75da540d880ae6070d861aeb6adabbe9a3' into kraken
* commit 'cdf96f75da540d880ae6070d861aeb6adabbe9a3':
Fix typo when parsing external platform version from Settings.
Merge commit '8b0047f82504ebc9b282ed950a85a758b59c4e14' into froyo-plus-aosp
* commit '8b0047f82504ebc9b282ed950a85a758b59c4e14':
Fix typo when parsing external platform version from Settings.
Merge commit 'b6c770e4e387bd73d4e7d4cbad99079b37f59043' into kraken
* commit 'b6c770e4e387bd73d4e7d4cbad99079b37f59043':
Respond to changes in throttle policy.
Merge commit '0b2ebe9b45172b9147f86fd69eedb2a200982b68' into froyo-plus-aosp
* commit '0b2ebe9b45172b9147f86fd69eedb2a200982b68':
Respond to changes in throttle policy.
We were updating limits and such before, but we were not applying them
to the current situation if we were already throttled. Now it can result in
us throttling or changing our throttle rate or unthrottling or even making
the ui come or go (disabling/enable throttling)
bug:2622543
bug:2619879
Change-Id: I64a62634d54f4768ab8625f8d72f9f66a239cb19
Merge commit '1b5a9c5d2fdf353d12ef1ca11dafc78f4c6f6c81' into kraken
* commit '1b5a9c5d2fdf353d12ef1ca11dafc78f4c6f6c81':
Add a Throttle check shortly after boot.
Merge commit '251ccef0445d4456809bfc41a6344e2dae24f2c3' into froyo-plus-aosp
* commit '251ccef0445d4456809bfc41a6344e2dae24f2c3':
Add a Throttle check shortly after boot.