Merge commit 'd69a5ee28cb5164233805a751a7c3deafba58668'
* commit 'd69a5ee28cb5164233805a751a7c3deafba58668':
b/2367020 Enable bt profiles by default for car dock.
Merge commit 'c5aa68f3f2201227e85e52ee33937e70e7741c3c' into eclair-plus-aosp
* commit 'c5aa68f3f2201227e85e52ee33937e70e7741c3c':
b/2367020 Enable bt profiles by default for car dock.
Merge commit '79270566b178ed7efc1c62f8410822d46d6e3152'
* commit '79270566b178ed7efc1c62f8410822d46d6e3152':
b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE
Merge commit 'd9d8ef264d3a66e7be84908cf0f9d78713c42722' into eclair-plus-aosp
* commit 'd9d8ef264d3a66e7be84908cf0f9d78713c42722':
b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE
Previously it was using America/Araguaina, which does not currently observe
DST. Brasilia is actually in an area that follows the Sao_Paulo rules.
Bug 2362824
Merge commit 'd638a7cb0841184349edbec2c995a36e5719cb8c'
* commit 'd638a7cb0841184349edbec2c995a36e5719cb8c':
b/2335545 Revert the dock strings back to "For Music and Media"
Merge commit '04e32ff35fe60cdd62509cff1df24d62cd464f4e' into eclair-plus-aosp
* commit '04e32ff35fe60cdd62509cff1df24d62cd464f4e':
b/2335545 Revert the dock strings back to "For Music and Media"
The build system does not honor user tags on apps,
and setting it is misleading.
This removes the confusion by making the makefiles
behave like they read.
Change-Id: I80f66b5f5409f1d51d929adfddf291bae3e066e1
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 'd8eec52a3786a51b38ed280afd84005e6da05ce6' into eclair-plus-aosp
* commit 'd8eec52a3786a51b38ed280afd84005e6da05ce6':
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 '29d70e44e42946f7b78f950bad0c4b22c7d5cb5f' into eclair-plus-aosp
* commit '29d70e44e42946f7b78f950bad0c4b22c7d5cb5f':
b/2334482 Disable Music and audio by default for the docks
