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 '842d983cc3158a3de77a897d071b5b9c18dd2b55' into froyo-plus-aosp
* commit '842d983cc3158a3de77a897d071b5b9c18dd2b55':
Fix an upgrade bug in SettingsProvider.
Merge commit 'c30890e102cbae24e4c821ba4274f6ac8b18f1db' into froyo-plus-aosp
* commit 'c30890e102cbae24e4c821ba4274f6ac8b18f1db':
Fix bug 2578813 Delay pausing music and routing audio for car docks
Merge commit 'b19da8e187db1cf223463809148b7cb2d9e9751a' into froyo-plus-aosp
* commit 'b19da8e187db1cf223463809148b7cb2d9e9751a':
Fix for 2581725. Keep the last frame after resume(), and delete it
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
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.
Merge commit '7e8614a547eca78dd9178001f8f6c38444adf350' into froyo-plus-aosp
* commit '7e8614a547eca78dd9178001f8f6c38444adf350':
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
Merge commit 'b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a' into froyo-plus-aosp
* commit 'b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a':
API CHANGE: remove obsolete constants and hide some methods
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.
This change removes some unused constants from BackupDataOutput
and hides a few methods that do not actually need to be exposed.
Change-Id: I47a9a107a5b58f4d53b5a2fcf9b73a765b1c5dd8
Merge commit '290a48b365479eccd16023b5de0d92063bb68b4d' into froyo-plus-aosp
* commit '290a48b365479eccd16023b5de0d92063bb68b4d':
Fix typos in name of density-independent pixels
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
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.
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.
Merge commit '63284ede623ca8a4119f1f44b86fbf017faba8dc' into froyo-plus-aosp
* commit '63284ede623ca8a4119f1f44b86fbf017faba8dc':
Do not check mWebTextView's focus state to determine editing mode.
