21152 Commits

Author SHA1 Message Date
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
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
Amith Yamasani
feb976e6be am 842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo
Merge commit '842d983cc3158a3de77a897d071b5b9c18dd2b55' into froyo-plus-aosp

* commit '842d983cc3158a3de77a897d071b5b9c18dd2b55':
  Fix an upgrade bug in SettingsProvider.
2010-04-13 10:08:10 -07:00
Amith Yamasani
842d983cc3 Merge "Fix an upgrade bug in SettingsProvider." into froyo 2010-04-13 10:05:27 -07:00
Jean-Michel Trivi
34b2ecc82a am c30890e1: Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo
Merge commit 'c30890e102cbae24e4c821ba4274f6ac8b18f1db' into froyo-plus-aosp

* commit 'c30890e102cbae24e4c821ba4274f6ac8b18f1db':
  Fix bug 2578813 Delay pausing music and routing audio for car docks
2010-04-13 09:54:47 -07:00
Gloria Wang
d4c072d3f5 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 'b19da8e187db1cf223463809148b7cb2d9e9751a' into froyo-plus-aosp

* commit 'b19da8e187db1cf223463809148b7cb2d9e9751a':
  Fix for 2581725. Keep the last frame after resume(), and delete it
2010-04-13 09:54:44 -07:00
Jean-Michel Trivi
c30890e102 Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo 2010-04-13 09:53:35 -07:00
Gloria Wang
b19da8e187 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.

Change-Id: I84286030eaae9061077d6ccb485b7dd53ef05341
2010-04-13 09:46:40 -07:00
Jean-Michel Trivi
4c637b9e34 Fix bug 2578813 Delay pausing music and routing audio for car docks
Moved broadcast of ACTION_AUDIO_BECOMING_NOISY from BluetoothA2dpService
to AudioService.
Broadcast ACTION_AUDIO_BECOMING_NOISY when disconnecting an A2DP
device.
Disconnect from A2DP docks with a delay to handle transient
disconnections.
Cancel delayed A2DP disconnections when connecting to a dock as this
can be a reconnection after a transient disconnection.

Change-Id: I1ee9e99f3ffa20727af38a4c4c8711942894a696
2010-04-13 09:44:08 -07:00
Daniel Sandler
de3601e05c am bcac4960: Honor the "Never vibrate" setting for incoming calls.
Merge commit 'bcac496076ef6f439147e7a2be71e8a2b76ddede' into froyo-plus-aosp

* commit 'bcac496076ef6f439147e7a2be71e8a2b76ddede':
  Honor the "Never vibrate" setting for incoming calls.
2010-04-13 09:21:47 -07:00
Daniel Sandler
bcac496076 Honor the "Never vibrate" setting for incoming calls.
Bug: 2579295
Change-Id: Ia4207492c5dfa2c39d27372c4892b60121b6d9e8
2010-04-13 12:18:44 -04:00
Kristian Monsen
b2d95503fd Fix for 2585858, load invalid urls.
The browser currently does not try to load invalid urls, that can be a problem. Now we only check if the host is correctly encoded.

Change-Id: Ie7380c59d4faab68a2f957e7f1ba8347e15e45a1
2010-04-13 16:48:32 +01:00
Daniel Sandler
b0cc22b405 am 15683534: Merge "Hide e-call button in layout." into froyo
Merge commit '15683534d1f1ca76a9a59ed921219db46ff5f800' into froyo-plus-aosp

* commit '15683534d1f1ca76a9a59ed921219db46ff5f800':
  Hide e-call button in layout.
2010-04-13 06:05:20 -07:00
Daniel Sandler
15683534d1 Merge "Hide e-call button in layout." into froyo 2010-04-13 06:00:02 -07:00
Dianne Hackborn
5943c200a4 Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...
...go directly to unlock screen

Fix a problem where, when we are moving windows due to a configuration
change, our wait to have the windows get redrawn would also
inadvertently make us think their surfaces should be hidden, leading
to nasty things like the lock screen thinking it should be shown
again (and thus forcing the orientation back to portrait).

Change-Id: I79057cfbc93ff59fd3558da997d4f73796e6aabe
2010-04-12 21:36:49 -07:00
Christopher Tate
7cc088232d SDK: last of the backup/restore docs content
There is probably still some editing and cleanup to do, but this takes care
of the last of the "need this documented by the time we ship!" material.

Bug #2465360

Change-Id: Ic4ce9e5a07c79aa2b584a18012a2e8fe199c19fd
2010-04-12 18:24:05 -07:00
Andreas Huber
248ea4a9f7 am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo
Merge commit '5baa5e1917ba4a212fa280b8b6cc3bbbf9382194' into froyo-plus-aosp

* commit '5baa5e1917ba4a212fa280b8b6cc3bbbf9382194':
  Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
2010-04-12 17:18:43 -07:00
Andreas Huber
5baa5e1917 Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo 2010-04-12 17:15:32 -07:00
Christopher Tate
6a75d6850c am 7e8614a5: Merge "SDK: more backup/restore documentation work" into froyo
Merge commit '7e8614a547eca78dd9178001f8f6c38444adf350' into froyo-plus-aosp

* commit '7e8614a547eca78dd9178001f8f6c38444adf350':
  SDK: more backup/restore documentation work
2010-04-12 16:18:16 -07:00
Christopher Tate
7e8614a547 Merge "SDK: more backup/restore documentation work" into froyo 2010-04-12 16:14:53 -07:00
Scott Main
10bb4990f3 am 3f371793: Merge "docs: fix bug 2590728" into froyo
Merge commit '3f371793287b6f10badc018fb9eaca33ac51a8e7' into froyo-plus-aosp

* commit '3f371793287b6f10badc018fb9eaca33ac51a8e7':
  docs: fix bug 2590728
2010-04-12 16:12:24 -07:00
Scott Main
3f37179328 Merge "docs: fix bug 2590728" into froyo 2010-04-12 16:09:28 -07:00
Andreas Huber
d0332ad8d2 Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
Change-Id: Ic9a9198413431db4ea40bb63b9de91aa8a7183af
related-to-bug: 2587341
2010-04-12 16:05:57 -07:00
Scott Main
ef4ca45340 docs: fix bug 2590728
Change-Id: I997c4fd3b3fbe33f479c3fe15b8164370c0a18af
2010-04-12 16:05:49 -07:00
Amith Yamasani
cd66caf015 Fix an upgrade bug in SettingsProvider.
Bug: 2569112

Wrong usage of local method.

Change-Id: I9d7c68baa7cf8dd2b7e4345555c1edc374de94e6
2010-04-12 15:49:12 -07:00
Christopher Tate
4e14a82912 SDK: more backup/restore documentation work
Still not complete, but here's a lot more of the necessary documentation.
Submitting a checkpoint seems prudent.

Bug #2465360

Change-Id: Ifff60d57e4b24cee21f3a34f5f50e290d377c386
2010-04-12 15:42:16 -07:00
Christopher Tate
7fef3c57eb am b9e3e4ce: Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo
Merge commit 'b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a' into froyo-plus-aosp

* commit 'b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a':
  API CHANGE: remove obsolete constants and hide some methods
2010-04-12 15:16:07 -07:00
Christopher Tate
b9e3e4ce7e Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo 2010-04-12 15:13:35 -07:00
Robert Greenwalt
2a7b730378 Fix Throttle Notification intents
Now goes to the correct settings page.

bug:2576057
Change-Id: I21df0e53f7f56ae9bf71f983a3aed200c5ac217d
2010-04-12 14:56:31 -07:00
Andreas Huber
98c5bd5556 am 6dbf80d0: Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we\'re waiting for its scheduled time to come in which case we\'d be removing it from the queue twice." into froyo
Merge commit '6dbf80d086d03d95c5f6331719edd6dd6dac0361' into froyo-plus-aosp

* commit '6dbf80d086d03d95c5f6331719edd6dd6dac0361':
  Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.
2010-04-12 14:19:23 -07:00
Andreas Huber
6dbf80d086 Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice." into froyo 2010-04-12 14:16:34 -07:00
Christopher Tate
fc922f1153 API CHANGE: remove obsolete constants and hide some methods
This change removes some unused constants from BackupDataOutput
and hides a few methods that do not actually need to be exposed.

Change-Id: I47a9a107a5b58f4d53b5a2fcf9b73a765b1c5dd8
2010-04-12 14:15:37 -07:00
Andreas Huber
ea1d6712fe Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.
Change-Id: I4e42e318fd5373d1f352f54027d4bf823126266d
related-to-bug: 2585276
2010-04-12 13:15:48 -07:00
Kenny Root
5b0fb521e6 am 290a48b3: Merge "Fix typos in name of density-independent pixels" into froyo
Merge commit '290a48b365479eccd16023b5de0d92063bb68b4d' into froyo-plus-aosp

* commit '290a48b365479eccd16023b5de0d92063bb68b4d':
  Fix typos in name of density-independent pixels
2010-04-12 12:20:50 -07:00
Kenny Root
290a48b365 Merge "Fix typos in name of density-independent pixels" into froyo 2010-04-12 12:19:08 -07:00
Jean-Michel Trivi
54419a4fc9 am 12221b6f: Merge "Fix monkey bug 2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack. This CL corr
Merge commit '12221b6f7c86349e3dcf89f814355e41f9e58cbf' into froyo-plus-aosp

* commit '12221b6f7c86349e3dcf89f814355e41f9e58cbf':
  Fix monkey bug 2586534 java.util.ConcurrentModificationException
2010-04-12 12:07:44 -07:00
Jean-Michel Trivi
12221b6f7c Merge "Fix monkey bug 2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack. This CL corrects this." into froyo 2010-04-12 12:05:08 -07:00
Patrick Scott
c9eaa3cbb0 am 36acfbc2: Add a bulk request method for bookmark icons.
Merge commit '36acfbc2b8df6e62f2d583933eca3a49265279a6' into froyo-plus-aosp

* commit '36acfbc2b8df6e62f2d583933eca3a49265279a6':
  Add a bulk request method for bookmark icons.
2010-04-12 11:53:09 -07:00
Patrick Scott
36acfbc2b8 Add a bulk request method for bookmark icons.
Rather than dispatch a message for every url in the db, send a message to the
WebCoreThread to handle the query and iteration.  Update the documentation for
requestAllIcons.

Bug: 2581894
Change-Id: I8af4f87570465dff3839db4ac492883e8805b007
2010-04-12 14:26:13 -04:00
Andreas Huber
f0a49f68f0 am 1d7a8b44: Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo
Merge commit '1d7a8b448e9371685894b6b02d29bcd3ae959545' into froyo-plus-aosp

* commit '1d7a8b448e9371685894b6b02d29bcd3ae959545':
  Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request.
2010-04-12 11:05:36 -07:00
Andreas Huber
1d7a8b448e Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo 2010-04-12 11:02:27 -07:00
Andreas Huber
8f14c55248 Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request.
Change-Id: I4cabd18709c29db0a2763a01cc86525ba0b0aeb7
related-to-bug: 2575976
2010-04-12 10:20:12 -07:00
Andreas Huber
10d4077240 am cdded187: Merge "Ignore corrupt aac audio frames and substitute silence." into froyo
Merge commit 'cdded187d20bdc6379c5a09bdd2002fa070b745d' into froyo-plus-aosp

* commit 'cdded187d20bdc6379c5a09bdd2002fa070b745d':
  Ignore corrupt aac audio frames and substitute silence.
2010-04-12 10:14:08 -07:00
Andreas Huber
b1e7bee2f3 am 040301ca: Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
Merge commit '040301cad17e447d760e7b7e54b79c8c294415ea' into froyo-plus-aosp

* commit '040301cad17e447d760e7b7e54b79c8c294415ea':
  Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
2010-04-12 10:12:29 -07:00
Andreas Huber
cdded187d2 Merge "Ignore corrupt aac audio frames and substitute silence." into froyo 2010-04-12 10:11:32 -07:00
Andreas Huber
3f26cade62 Ignore corrupt aac audio frames and substitute silence.
Change-Id: I544f98a5c00d912061db7921fc4518435209b168
related-to-bug: 2575976
2010-04-12 09:57:05 -07:00
Andreas Huber
040301cad1 Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
Change-Id: Ieaa90cc9b54bd56963aa5f4daced2ba243801acf
related-to-bug: 2585913
2010-04-12 09:41:12 -07:00
Leon Scroggins
853a42409b am 63284ede: Do not check mWebTextView\'s focus state to determine editing mode.
Merge commit '63284ede623ca8a4119f1f44b86fbf017faba8dc' into froyo-plus-aosp

* commit '63284ede623ca8a4119f1f44b86fbf017faba8dc':
  Do not check mWebTextView's focus state to determine editing mode.
2010-04-12 08:11:40 -07:00