Merge commit 'd8eec52a3786a51b38ed280afd84005e6da05ce6' into eclair-plus-aosp
* commit 'd8eec52a3786a51b38ed280afd84005e6da05ce6':
b/2318290 connect should be called instead of connect(profile) if device is unpaired.
Merge commit '29d70e44e42946f7b78f950bad0c4b22c7d5cb5f' into eclair-plus-aosp
* commit '29d70e44e42946f7b78f950bad0c4b22c7d5cb5f':
b/2334482 Disable Music and audio by default for the docks
Merge commit '052ad24219bbb170d9d028a460741524a768915a' into eclair-plus-aosp
* commit '052ad24219bbb170d9d028a460741524a768915a':
b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
Merge commit '9463c2f8d5f09ef9cc015405640bbf845f0f7a8a' into eclair-plus-aosp
* commit '9463c2f8d5f09ef9cc015405640bbf845f0f7a8a':
b/2320107 NPE when receiving a Undock event without a device
Merge commit 'a87f2fd7d82e5055e0f9ea2c93704ed0b58f27ef' into eclair-plus-aosp
* commit 'a87f2fd7d82e5055e0f9ea2c93704ed0b58f27ef':
b/2320107 Fixed NPE for class bits. Docks do not have class bits.
Merge commit '613549a622eac8278c9f81a1df83484c256652bf' into eclair-plus-aosp
* commit '613549a622eac8278c9f81a1df83484c256652bf':
Fix desk dock getting stuck after unpairing.
Note: This is a workaround. The read problem is that
we are making a call to Bluez when it is not ready yet.
The interface has not been registered, so dbus call should fail.
We need to fix this properly.
Dr No: Eastham
Bug: 2317784
Merge commit '6e3ee10a99b4d71ffe8f2473dcb8c6dbf4da0ed5' into eclair-plus-aosp
* commit '6e3ee10a99b4d71ffe8f2473dcb8c6dbf4da0ed5':
Fix auto connection of A2DP profile.
Merge commit 'e273289cfb74e08ef0ab35afe2ca34a167a533d8' into eclair-plus-aosp
* commit 'e273289cfb74e08ef0ab35afe2ca34a167a533d8':
Import revised translations. DO NOT MERGE
Merge commit '1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda' into eclair-plus-aosp
* commit '1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda':
b/2296110 Car Dock - Stop service when done processing each command. Clean up logs.
Merge commit '488a80a7b111f5906bf51101785a95a6c640d265' into eclair-plus-aosp
* commit '488a80a7b111f5906bf51101785a95a6c640d265':
b/2314560 Prevent PIN dialog from showing up on undocked docks
If unpaired while undocked, device will be removed from the BT device list.
If unpaired while docked, the user can do pair and connect. No PIN dialog will pop up.
If undocked after unpaired, device will be removed from the BT device list.
Change-Id: Id587a517999e08641451f78dec8696a06028cf16
Merge commit 'a9f9031ba35433a7e009da6099b17cf603372a70' into eclair-plus-aosp
* commit 'a9f9031ba35433a7e009da6099b17cf603372a70':
Display icons in the correct density in the ActivityPicker.
Merge commit '146385663bb55d9f55ad179d3c35ccf5cac13fc8' into eclair-plus-aosp
* commit '146385663bb55d9f55ad179d3c35ccf5cac13fc8':
b/2296110 Car Dock - Enable BT if not already enabled.
Merge commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350' into eclair-plus-aosp
* commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350':
b/2296110 Dialog for setting up dock audio.
Reimplemented as a Foreground Service just so it can get on top of the Car Dock App.
Added debounce mechanism to not disconnect immediately after getting a undock event.
Each dock now has its own "Remember setting".
Remember Settings is on by default
Change-Id: I80790bdb7c831e2a642365b92433012191aa70c1
Merge commit '55dc6cb99db1f9f6677dfec5a25a34e933807be5' into eclair-plus-aosp
* commit '55dc6cb99db1f9f6677dfec5a25a34e933807be5':
Disconnect even Sinks in Connecting state while connecting another sink.
Merge commit '0bd445b974292dc3910b6bb85dcee7e7c378968f' into eclair-plus-aosp
* commit '0bd445b974292dc3910b6bb85dcee7e7c378968f':
b/2296110 New Dialog which appears when phone is place on dock.
Merge commit '3327f7887328c55ef2d837a8e2a07cea2070c744' into eclair-plus-aosp
* commit '3327f7887328c55ef2d837a8e2a07cea2070c744':
b/2293042 Fixed the problem where A2DP connections may fail if there's an existing connection to another device.
Merge commit '9f1d9c16887d2bdebce65ceb1ac80e1fedd9ef48' into eclair-plus-aosp
* commit '9f1d9c16887d2bdebce65ceb1ac80e1fedd9ef48':
Update to reflect new priorities for A2DP profile. DO NOT MERGE.