summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/bluetooth
diff options
context:
space:
mode:
authorZhihai Xu <zhihaixu@google.com>2014-04-30 18:28:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-30 18:28:49 +0000
commit3cfb6885b4075a3887cb0acb437704394fc9e90e (patch)
tree74b85c9eb91e1a8e732b078002a165e37fe01a85 /src/com/android/settings/bluetooth
parentc88835851d57fda27608822ed2cd4ffdb87292fb (diff)
parentd6b0b1721a684be1805025908c4733a6b02794a4 (diff)
downloadpackages_apps_Settings-3cfb6885b4075a3887cb0acb437704394fc9e90e.tar.gz
packages_apps_Settings-3cfb6885b4075a3887cb0acb437704394fc9e90e.tar.bz2
packages_apps_Settings-3cfb6885b4075a3887cb0acb437704394fc9e90e.zip
am d6b0b172: am 7dd84651: Merge "Display BTH connected status correctly"
* commit 'd6b0b1721a684be1805025908c4733a6b02794a4': Display BTH connected status correctly
Diffstat (limited to 'src/com/android/settings/bluetooth')
-rw-r--r--src/com/android/settings/bluetooth/BluetoothDevicePreference.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index 80a3d1f01..6481f2a07 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -232,7 +232,7 @@ public final class BluetoothDevicePreference extends Preference implements
break;
case BluetoothProfile.STATE_DISCONNECTED:
- if (profile.isProfileReady() && profile.isPreferred(cachedDevice.getDevice())) {
+ if (profile.isProfileReady()) {
if (profile instanceof A2dpProfile) {
a2dpNotConnected = true;
} else if (profile instanceof HeadsetProfile) {