Dianne Hackborn
3cbaf63564
Merge " 2593833 AccessibilityManager not properly initialized immediately upon registration in the AccessibilityManagerService"
2010-04-14 12:00:17 -07:00
Carl Shapiro
aa034b9445
Merge "Add command line flags to enable lock profiling."
2010-04-13 18:27:55 -07:00
Robert Greenwalt
fd0c2cc044
am 13ec98f3: am 84748629: am a466ffe0: am d3bb93f6: Add build config values for data use defaults
2010-04-13 16:29:12 -07:00
James Dong
c6c72e78df
am 748a8df0: am c33f583b: am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html " into froyo
2010-04-13 16:29:08 -07:00
Suchi Amalapurapu
c27556ae49
am 3cf6bba0: am 2ae08f70: am a55987df: am 812b24fd: Merge "Fix crashes related to unmounting when app on sdcard has an active notification in status bar. When unmounting sdcard, all the secure containers have to be unmounted first before invoking the MountService call
2010-04-13 16:29:04 -07:00
Robert Greenwalt
9db16ac288
am ae5ec702: am 7024396f: am 7125a0dc: am 42843c3c: Merge "Fix Throttle Notification intents" into froyo
2010-04-13 16:28:58 -07:00
Christopher Tate
1e03b0f780
am c2b8b5f8: am 0162c3c7: am 3643dc8c: am 3069a6da: Merge "SDK: last of the backup/restore docs content" into froyo
2010-04-13 16:28:51 -07:00
Andreas Huber
e97c39e6fa
am 5ab60ba0: am d760afc3: am 30e9c2d4: am db281311: Merge "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
2010-04-13 16:24:54 -07:00
James Dong
f462db75ca
am eee53a7d: am ebaa935e: am 9bb8e65a: am c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo
2010-04-13 16:24:49 -07:00
Grace Kloba
361fec2c72
am 105c58de: am 346c97c4: am 58af51a1: am 763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
2010-04-13 16:24:42 -07:00
Amith Yamasani
bfe69ce650
am ecf917b6: am 61f280d5: am feb976e6: am 842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo
2010-04-13 16:24:36 -07:00
Jean-Michel Trivi
a49c26e5ac
am 824ca797: am b8430335: am 34b2ecc8: am c30890e1: Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo
2010-04-13 16:24:29 -07:00
Gloria Wang
0a95706b64
am ce387505: am 465934d1: am d4c072d3: am b19da8e1: Fix for 2581725. Keep the last frame after resume(), and delete it in the next suspend() or reuse it if no new frame is available.
2010-04-13 16:24:23 -07:00
Daniel Sandler
c1144b5eef
am cd3f349f: am a32efedd: am de3601e0: am bcac4960: Honor the "Never vibrate" setting for incoming calls.
2010-04-13 16:24:16 -07:00
Robert Greenwalt
287cb95758
am 84748629: am a466ffe0: am d3bb93f6: Add build config values for data use defaults
2010-04-13 16:23:09 -07:00
James Dong
ea0e3fcf2a
am c33f583b: am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html " into froyo
2010-04-13 16:23:05 -07:00
Suchi Amalapurapu
8d37626907
am 2ae08f70: am a55987df: am 812b24fd: Merge "Fix crashes related to unmounting when app on sdcard has an active notification in status bar. When unmounting sdcard, all the secure containers have to be unmounted first before invoking the MountService call back. We sen
2010-04-13 16:23:01 -07:00
Robert Greenwalt
8ff3183598
am 7024396f: am 7125a0dc: am 42843c3c: Merge "Fix Throttle Notification intents" into froyo
2010-04-13 16:22:51 -07:00
Christopher Tate
53a2cd6658
am 0162c3c7: am 3643dc8c: am 3069a6da: Merge "SDK: last of the backup/restore docs content" into froyo
2010-04-13 16:22:16 -07:00
Robert Greenwalt
f3599f5b90
am a466ffe0: am d3bb93f6: Add build config values for data use defaults
...
Merge commit 'a466ffe042ca0a7ef14d3942114f3ea916db225e' into kraken
* commit 'a466ffe042ca0a7ef14d3942114f3ea916db225e':
Add build config values for data use defaults
2010-04-13 16:09:19 -07:00
Robert Greenwalt
59d87ea610
am d3bb93f6: 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
2010-04-13 16:07:19 -07:00
Andreas Huber
f31a6af966
am d760afc3: am 30e9c2d4: am db281311: Merge "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
2010-04-13 16:05:49 -07:00
James Dong
7045f2b186
am ebaa935e: am 9bb8e65a: am c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo
2010-04-13 16:05:42 -07:00
Grace Kloba
e82b629d3d
am 346c97c4: am 58af51a1: am 763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
2010-04-13 16:05:34 -07:00
Amith Yamasani
f018568bff
am 61f280d5: am feb976e6: am 842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo
2010-04-13 16:05:27 -07:00
Jean-Michel Trivi
9bf31a9e98
am b8430335: am 34b2ecc8: am c30890e1: Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo
2010-04-13 16:05:21 -07:00
Gloria Wang
3907504ed2
am 465934d1: am d4c072d3: am b19da8e1: Fix for 2581725. Keep the last frame after resume(), and delete it in the next suspend() or reuse it if no new frame is available.
2010-04-13 16:05:13 -07:00
Daniel Sandler
b86b59f685
am a32efedd: am de3601e0: am bcac4960: Honor the "Never vibrate" setting for incoming calls.
2010-04-13 16:05:07 -07:00
James Dong
92cd4070b1
am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html " into froyo
...
Merge commit '4f3257cf4667aa28908c401634db849fd2e516af' into kraken
* commit '4f3257cf4667aa28908c401634db849fd2e516af':
Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html
2010-04-13 15:42:01 -07:00
James Dong
9ef2dd0d62
am dd684af8: Merge "Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html " into froyo
...
Merge commit 'dd684af8c8fd5984d4d40b125bfac1ce268622ae' into froyo-plus-aosp
* commit 'dd684af8c8fd5984d4d40b125bfac1ce268622ae':
Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html
2010-04-13 15:37:50 -07:00
Suchi Amalapurapu
57386673fc
am a55987df: am 812b24fd: Merge "Fix crashes related to unmounting when app on sdcard has an active notification 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
...
Merge commit 'a55987df919240b045de977217bd55723c37dfcb' into kraken
* commit 'a55987df919240b045de977217bd55723c37dfcb':
Fix crashes related to unmounting when app on sdcard has an active notification
2010-04-13 15:36:10 -07:00
James Dong
abc56d75be
Merge "Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html " into froyo
2010-04-13 15:34:20 -07:00
Suchi Amalapurapu
1b41d11990
am 812b24fd: Merge "Fix crashes related to unmounting when app on sdcard has an active notification 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 disabl
...
Merge commit '812b24fd9d254f37e34f2878f599253a1f3bffe9' into froyo-plus-aosp
* commit '812b24fd9d254f37e34f2878f599253a1f3bffe9':
Fix crashes related to unmounting when app on sdcard has an active notification
2010-04-13 15:32:59 -07:00
Suchi Amalapurapu
70bff6c129
Merge "Fix crashes related to unmounting when app on sdcard has an active notification 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." into froyo
2010-04-13 15:30:07 -07:00
Robert Greenwalt
8eb30530e9
am 7125a0dc: am 42843c3c: Merge "Fix Throttle Notification intents" into froyo
...
Merge commit '7125a0dca844b066a3f6ebdacaea4ade9e651c8d' into kraken
* commit '7125a0dca844b066a3f6ebdacaea4ade9e651c8d':
Fix Throttle Notification intents
2010-04-13 15:29:19 -07:00
Robert Greenwalt
72397544b4
am 42843c3c: Merge "Fix Throttle Notification intents" into froyo
...
Merge commit '42843c3ceb8b17e860112f8f2718cda40de15839' into froyo-plus-aosp
* commit '42843c3ceb8b17e860112f8f2718cda40de15839':
Fix Throttle Notification intents
2010-04-13 15:25:05 -07:00
Robert Greenwalt
2a75ab0da5
Merge "Fix Throttle Notification intents" into froyo
2010-04-13 15:22:00 -07:00
Christopher Tate
bf82379ecd
am 3643dc8c: am 3069a6da: Merge "SDK: last of the backup/restore docs content" into froyo
...
Merge commit '3643dc8c73bbf53c7aa6bb73d09d83c7578639e0' into kraken
* commit '3643dc8c73bbf53c7aa6bb73d09d83c7578639e0':
SDK: last of the backup/restore docs content
2010-04-13 14:29:28 -07:00
Christopher Tate
c33ba4f4e8
am 3069a6da: Merge "SDK: last of the backup/restore docs content" into froyo
...
Merge commit '3069a6dafabd5a6ba2b1378e2c3b48adb9ba8778' into froyo-plus-aosp
* commit '3069a6dafabd5a6ba2b1378e2c3b48adb9ba8778':
SDK: last of the backup/restore docs content
2010-04-13 14:24:54 -07:00
Christopher Tate
e5c64a9003
Merge "SDK: last of the backup/restore docs content" into froyo
2010-04-13 14:21:48 -07:00
Andreas Huber
59c7bab6d9
am 30e9c2d4: am db281311: Merge "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"." in
...
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".
2010-04-13 12:23:28 -07:00
James Dong
8d9ffd0b97
am 9bb8e65a: am c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo
...
Merge commit '9bb8e65a7d7dc57fdd7383d64d53414b1aa5cbbc' into kraken
* commit '9bb8e65a7d7dc57fdd7383d64d53414b1aa5cbbc':
Don't set encoder component role while we query decoders
2010-04-13 12:20:38 -07:00
Grace Kloba
0a78255398
am 58af51a1: am 763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
...
Merge commit '58af51a1f2afc20ac1f1465b13c300754358be6c' into kraken
* commit '58af51a1f2afc20ac1f1465b13c300754358be6c':
Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
2010-04-13 12:20:35 -07:00
Andreas Huber
5cfe7910a3
am db281311: Merge "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"." into froyo
...
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".
2010-04-13 12:20:09 -07:00
Andreas Huber
daeec8c5b3
Merge "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"." into froyo
2010-04-13 12:16:08 -07:00
James Dong
263f52f58e
am c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo
...
Merge commit 'c15f48d7d6047f4f7d7809673fc9728b368f9b0b' into froyo-plus-aosp
* commit 'c15f48d7d6047f4f7d7809673fc9728b368f9b0b':
Don't set encoder component role while we query decoders
2010-04-13 12:15:26 -07:00
Grace Kloba
6e5467d2b4
am 763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
...
Merge commit '763e62a831f6cf4e113bff868dab4d48560a3693' into froyo-plus-aosp
* commit '763e62a831f6cf4e113bff868dab4d48560a3693':
Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
2010-04-13 12:14:32 -07:00
James Dong
ce95b94082
Merge "Don't set encoder component role while we query decoders" into froyo
2010-04-13 12:11:57 -07:00
Amith Yamasani
ef18fda571
am feb976e6: am 842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo
...
Merge commit 'feb976e6be3a07dd31b35b35287420bba9ffbbf3' into kraken
* commit 'feb976e6be3a07dd31b35b35287420bba9ffbbf3':
Fix an upgrade bug in SettingsProvider.
2010-04-13 11:54:04 -07:00
Jean-Michel Trivi
6feb51a629
am 34b2ecc8: am c30890e1: Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo
...
Merge commit '34b2ecc82aae3d317c2f4985049f68df3f8adbd7' into kraken
* commit '34b2ecc82aae3d317c2f4985049f68df3f8adbd7':
Fix bug 2578813 Delay pausing music and routing audio for car docks
2010-04-13 11:53:57 -07:00