Suchi Amalapurapu
6d46982a20
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
dc066b4af5
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
cdb45b0edb
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
76531828c7
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
c488e161b5
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
d40746b13d
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
6906da34a7
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
7558905bdf
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
e2693174a4
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
57e6f58bb7
am cd3f349f: am a32efedd: am de3601e0: am bcac4960: Honor the "Never vibrate" setting for incoming calls.
2010-04-13 16:24:16 -07:00
Suchi Amalapurapu
3cf6bba0b6
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
ae5ec70225
am 7024396f: am 7125a0dc: am 42843c3c: Merge "Fix Throttle Notification intents" into froyo
2010-04-13 16:22:51 -07:00
Christopher Tate
c2b8b5f8f5
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
Andreas Huber
5ab60ba0c1
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
eee53a7dfa
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
105c58de02
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
ecf917b68d
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
824ca797f0
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
ce3875055e
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
cd3f349f32
am a32efedd: am de3601e0: am bcac4960: Honor the "Never vibrate" setting for incoming calls.
2010-04-13 16:05:07 -07:00
Suchi Amalapurapu
2ae08f70f2
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
Suchi Amalapurapu
a55987df91
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
812b24fd9d
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
7024396fc2
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
7125a0dca8
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
42843c3ceb
Merge "Fix Throttle Notification intents" into froyo
2010-04-13 15:22:00 -07:00
Christopher Tate
0162c3c7aa
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
3643dc8c73
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
3069a6dafa
Merge "SDK: last of the backup/restore docs content" into froyo
2010-04-13 14:21:48 -07:00
Andreas Huber
d760afc3b5
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
ebaa935e2d
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
346c97c477
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
30e9c2d4db
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
db281311a0
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
9bb8e65a7d
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
58af51a1f2
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
c15f48d7d6
Merge "Don't set encoder component role while we query decoders" into froyo
2010-04-13 12:11:57 -07:00
Andreas Huber
662292ae2d
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".
...
related-to-bug: 2553359
Change-Id: Ic49eb89feb62474d9513bc21571e0e8fe3a15e0b
2010-04-13 12:04:05 -07:00
Steve Howard
16bd9372ee
Hide zoom buttons when a view gets hidden, i.e. by a TabHost
...
When a View uses a ZoomButtonsController, it needs to explicitly hide
the zoom controls when it gets hidden itself, such as when it's within
a TabHost. Add a note to the javadoc to do this via
onVisibilityChanged(), and update WebView to follow the instructions.
Thanks to Ross Levinsky for discovering and tracking this one down.
Bug: 2582718
Change-Id: Ia0c9ea4efcb29eb1f321be54f3d8ae1e056df6b7
CC: rosslevinsky@google.com
2010-04-13 11:55:02 -07:00
Amith Yamasani
61f280d520
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
b843033566
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
Gloria Wang
465934d1e5
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.
...
Merge commit 'd4c072d3f584db2cf9214c9d813c15d9e646c527' into kraken
* commit 'd4c072d3f584db2cf9214c9d813c15d9e646c527':
Fix for 2581725. Keep the last frame after resume(), and delete it
2010-04-13 11:53:52 -07:00
Daniel Sandler
a32efedd26
am de3601e0: am bcac4960: Honor the "Never vibrate" setting for incoming calls.
...
Merge commit 'de3601e05cf551e24eee50d4c1e70b5037792679' into kraken
* commit 'de3601e05cf551e24eee50d4c1e70b5037792679':
Honor the "Never vibrate" setting for incoming calls.
2010-04-13 11:53:30 -07:00
Grace Kloba
763e62a831
Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
...
We skipped a call to WebKit at the end of the zoom
animation in the last CL.
Fix http://b/issue?id=2578820
2010-04-13 11:35:10 -07:00
Suchi Amalapurapu
3d24425165
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.
Change-Id: I831da1ae54aeec89de3601b94a4a2fae5dc7e495
2010-04-13 11:20:57 -07:00
James Dong
722d591842
Don't set encoder component role while we query decoders
...
bug - 2558515
Change-Id: I29683507d234d963994c782c07508034ea807739
2010-04-13 10:58:41 -07:00
Daniel Sandler
aedb01dcc7
am ba7aa766: am 8dc634e8: am b0cc22b4: am 15683534: Merge "Hide e-call button in layout." into froyo
2010-04-13 10:37:59 -07:00
Mathias Agopian
f221b6324d
am e73a100f: am 445a9785: Merge "don\'t hardcode "mSurface" throughout our source code" into kraken
2010-04-13 10:37:55 -07:00
Daniel Sandler
ba7aa7669b
am 8dc634e8: am b0cc22b4: am 15683534: Merge "Hide e-call button in layout." into froyo
2010-04-13 10:33:11 -07:00
Mathias Agopian
e73a100feb
am 445a9785: Merge "don\'t hardcode "mSurface" throughout our source code" into kraken
2010-04-13 10:33:07 -07:00