commit 110ddbfea0b6ba8702d3f7ba9d00c9f97c908dbb
author Jeff Sharkey <jsharkey@android.com> Fri May 09 17:35:27 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 09 17:35:27 2014 +0000
tree 08d713005c3220fe5e53d11d102b2f66cc1b2c1d
parent 7dd84651a25566c5a2152d935f19a11cebfc58ae
parent bf427a2064e76cabc5e50573bcfcc0c954dd0720

Merge "Fix NullPointerException issue when user change"

src/com/android/settings/bluetooth/BluetoothDevicePreference.java

diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index 80a3d1f..6481f2a 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -232,7 +232,7 @@
                     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) {