Merge commit 'cd616247db69bdae8ab781be1f1d646ac7abf755' into kraken
* commit 'cd616247db69bdae8ab781be1f1d646ac7abf755':
Framework change for #2583442: Navigation dies when night mode changes
Merge commit 'ce73c1e5bfd36154d21ee7b332cfdc6cea48812e' into froyo-plus-aosp
* commit 'ce73c1e5bfd36154d21ee7b332cfdc6cea48812e':
Framework change for #2583442: Navigation dies when night mode changes
Merge commit 'fbd22f072b48be4b465085fb5354890e2f10fd32' into kraken
* commit 'fbd22f072b48be4b465085fb5354890e2f10fd32':
Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...
The window manager doesn't retain its keep screen on lock while
in the process of destroying and creating new activity windows during
a config change. Now it does.
Unfortunately, this doesn't help maps, since it doesn't use our
lovely KEEP_SCREEN_ON flag. :p
Change-Id: Ida4bc0fcfe132cdff2bd4eeb7ba0ce9731504d14
Merge commit 'ae8c2c71f7791ed0321e56f31f0c1276da4d8842' into froyo-plus-aosp
* commit 'ae8c2c71f7791ed0321e56f31f0c1276da4d8842':
Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...
...SD card causes reboot.
Add option to not include temporarily unavailable recent tasks,
for the recent tasks UI to not display them.
Change-Id: I1495ca217b4292fd56f537459b44c0624262c292
Merge commit '53a37509c3a9301423ee6ec47c71bcea47e46d9c' into kraken
* commit '53a37509c3a9301423ee6ec47c71bcea47e46d9c':
If we defer processing the touch events, pass the
Merge commit 'ba6339fe2ba2d7325a99201e82d951064efa31a2' into froyo-plus-aosp
* commit 'ba6339fe2ba2d7325a99201e82d951064efa31a2':
If we defer processing the touch events, pass the
original view coordinate with TouchEventData and use
them when we reprocess the events. We can't depend
on contentToView() to convert the doc point to the
view point. When we originally convert the view to
doc, the scroll position in UI doesn't change. When
we convert the doc back to view, we are chasing a
moving target. That is why we saw bigger delta.
Fix http://b/issue?id=2577274
Merge commit 'a466ffe042ca0a7ef14d3942114f3ea916db225e' into kraken
* commit 'a466ffe042ca0a7ef14d3942114f3ea916db225e':
Add build config values for data use defaults
Merge commit 'd3bb93f6870581eebbf08b5b7fb0a9c5eaad8b16' into froyo-plus-aosp
* commit 'd3bb93f6870581eebbf08b5b7fb0a9c5eaad8b16':
Add build config values for data use defaults
Don't use hard coded defaults - use build configs instead.
Iface is now ONLY set by config so gservices doesn't need to.
bug:2576057
Change-Id: I8f9e3bc51af3b1cdf8bb4290a43197d9c01e2a14
Merge commit '4f3257cf4667aa28908c401634db849fd2e516af' into kraken
* commit '4f3257cf4667aa28908c401634db849fd2e516af':
Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html
Merge commit 'dd684af8c8fd5984d4d40b125bfac1ce268622ae' into froyo-plus-aosp
* commit 'dd684af8c8fd5984d4d40b125bfac1ce268622ae':
Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html
Merge commit 'a55987df919240b045de977217bd55723c37dfcb' into kraken
* commit 'a55987df919240b045de977217bd55723c37dfcb':
Fix crashes related to unmounting when app on sdcard has an active notification
Merge commit '812b24fd9d254f37e34f2878f599253a1f3bffe9' into froyo-plus-aosp
* commit '812b24fd9d254f37e34f2878f599253a1f3bffe9':
Fix crashes related to unmounting when app on sdcard has an active notification
Merge commit '3643dc8c73bbf53c7aa6bb73d09d83c7578639e0' into kraken
* commit '3643dc8c73bbf53c7aa6bb73d09d83c7578639e0':
SDK: last of the backup/restore docs content
Merge commit '3069a6dafabd5a6ba2b1378e2c3b48adb9ba8778' into froyo-plus-aosp
* commit '3069a6dafabd5a6ba2b1378e2c3b48adb9ba8778':
SDK: last of the backup/restore docs content
Merge commit '30e9c2d4db145e02b5312ce29606b03dd78349d3' into kraken
* commit '30e9c2d4db145e02b5312ce29606b03dd78349d3':
Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a".
Merge commit '9bb8e65a7d7dc57fdd7383d64d53414b1aa5cbbc' into kraken
* commit '9bb8e65a7d7dc57fdd7383d64d53414b1aa5cbbc':
Don't set encoder component role while we query decoders
Merge commit 'db281311a0e957ba989509cf11f2085b4db12074' into froyo-plus-aosp
* commit 'db281311a0e957ba989509cf11f2085b4db12074':
Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a".
Merge commit 'c15f48d7d6047f4f7d7809673fc9728b368f9b0b' into froyo-plus-aosp
* commit 'c15f48d7d6047f4f7d7809673fc9728b368f9b0b':
Don't set encoder component role while we query decoders
Merge commit '763e62a831f6cf4e113bff868dab4d48560a3693' into froyo-plus-aosp
* commit '763e62a831f6cf4e113bff868dab4d48560a3693':
Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
Merge commit 'feb976e6be3a07dd31b35b35287420bba9ffbbf3' into kraken
* commit 'feb976e6be3a07dd31b35b35287420bba9ffbbf3':
Fix an upgrade bug in SettingsProvider.
Merge commit '34b2ecc82aae3d317c2f4985049f68df3f8adbd7' into kraken
* commit '34b2ecc82aae3d317c2f4985049f68df3f8adbd7':
Fix bug 2578813 Delay pausing music and routing audio for car docks
Merge commit 'd4c072d3f584db2cf9214c9d813c15d9e646c527' into kraken
* commit 'd4c072d3f584db2cf9214c9d813c15d9e646c527':
Fix for 2581725. Keep the last frame after resume(), and delete it
I6872c3ad135bc34348adafa76e08a3878f1b506f
"Add emergency call button to PUK'd lockscreen."
Bug: 2568732
I5ad8745443fc97225af9efb938e4640cfc29b5d7
"Restore text field used by sliding tab to give ringer
mode feedback."
Bug: 2587358
Change-Id: Ide3ad839aaf029930c0bf7ba4b9f6587efbd811d
in status bar.
When unmounting sdcard, all the secure containers have to be unmounted first
before invoking the MountService call back. We send a broadcast
about disabled packages. Force a gc to clean up any stale asset references
and then unmount the containers before invoking the MountService call back.
Change-Id: I831da1ae54aeec89de3601b94a4a2fae5dc7e495
Merge commit '842d983cc3158a3de77a897d071b5b9c18dd2b55' into froyo-plus-aosp
* commit '842d983cc3158a3de77a897d071b5b9c18dd2b55':
Fix an upgrade bug in SettingsProvider.
