Merge commit '3a6b2df23950cd64c10dfbb437aa56a99cbce54a'
* commit '3a6b2df23950cd64c10dfbb437aa56a99cbce54a':
b/2370089 Pop the dock dialog above the keyguard
Merge commit 'fcd4e7fec3c80d0a16630246c4942595d34c655c'
* commit 'fcd4e7fec3c80d0a16630246c4942595d34c655c':
b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly.
Merge commit '97ed3f4b1ce40fd3ec8bc34bf2bfb7438b28afd7'
* commit '97ed3f4b1ce40fd3ec8bc34bf2bfb7438b28afd7':
b/2332395 Disable BT when undocked if BT was off to at docking time
Merge commit '49efbf8b5b7a6817a4a1020982cb34f4ca226d48'
* commit '49efbf8b5b7a6817a4a1020982cb34f4ca226d48':
b/2367861 Auto connect if the user turns on BT while docked.
unless if 1) the user has manually turned off bt while docked or
2) there's a connect device at the time we are ready to turn off bt
Change-Id: Ic27308688a525120a09a25c9416b3cdc477412ab
This mainly changes the way both enablers react to the airplane mode. Now
enablers show a toast message instead of disabling the check box directly. This
avoids the inconsistent state introduced by WirelessSettings which controls the
check box using layout dependency.
Related bug: 2053751
Merge commit 'd69a5ee28cb5164233805a751a7c3deafba58668'
* commit 'd69a5ee28cb5164233805a751a7c3deafba58668':
b/2367020 Enable bt profiles by default for car dock.
Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS is a list of
radios that can be toggled while in airplane mode. This CL
changes BluetoothEnabler to respect this.
It parallels the logic in WifiEnabler, which enables OEMs
to allow Wifi changes when in airplane mode.
Most existing devices don't include "bluetooth" in the
toggleable list, which means bluetooth will continue to be
disabled when in airplane mode for those devices.
Fixes http://b/2297314
Merge commit 'f4ec356df960245889da6f7518ec28c862ebf5e6'
* commit 'f4ec356df960245889da6f7518ec28c862ebf5e6':
b/2318290 connect should be called instead of connect(profile) if device is unpaired.
Merge commit 'fcea8c0d131e019e4441fa239720a5e4ecf9ed7d'
* commit 'fcea8c0d131e019e4441fa239720a5e4ecf9ed7d':
b/2334482 Disable Music and audio by default for the docks
Merge commit '052ad24219bbb170d9d028a460741524a768915a' into eclair-mr2
* commit '052ad24219bbb170d9d028a460741524a768915a':
b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
Merge commit '9463c2f8d5f09ef9cc015405640bbf845f0f7a8a' into eclair-mr2
* commit '9463c2f8d5f09ef9cc015405640bbf845f0f7a8a':
b/2320107 NPE when receiving a Undock event without a device
Merge commit 'a87f2fd7d82e5055e0f9ea2c93704ed0b58f27ef' into eclair-mr2
* commit 'a87f2fd7d82e5055e0f9ea2c93704ed0b58f27ef':
b/2320107 Fixed NPE for class bits. Docks do not have class bits.
Merge commit '613549a622eac8278c9f81a1df83484c256652bf' into eclair-mr2
* commit '613549a622eac8278c9f81a1df83484c256652bf':
Fix desk dock getting stuck after unpairing.
Merge commit '6e3ee10a99b4d71ffe8f2473dcb8c6dbf4da0ed5' into eclair-mr2
* commit '6e3ee10a99b4d71ffe8f2473dcb8c6dbf4da0ed5':
Fix auto connection of A2DP profile.
Merge commit '1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda' into eclair-mr2
* commit '1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda':
b/2296110 Car Dock - Stop service when done processing each command. Clean up logs.
Merge commit '488a80a7b111f5906bf51101785a95a6c640d265' into eclair-mr2
* commit '488a80a7b111f5906bf51101785a95a6c640d265':
b/2314560 Prevent PIN dialog from showing up on undocked docks
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
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 '146385663bb55d9f55ad179d3c35ccf5cac13fc8' into eclair-mr2
* commit '146385663bb55d9f55ad179d3c35ccf5cac13fc8':
b/2296110 Car Dock - Enable BT if not already enabled.
