diff options
| author | Matthew Xie <mattx@google.com> | 2011-07-20 19:08:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-20 19:08:38 -0700 |
| commit | 7699c18a079d232280c2701fb20d36f75d379e03 (patch) | |
| tree | d890d439990238c0482f87cfc7b6f473d582a979 | |
| parent | 3a8801e0599cfd8f12750d65ee309e20a33e04f6 (diff) | |
| parent | e3dc975acb716eede4abb0d1f4a5f969f92fc307 (diff) | |
| download | frameworks_base-7699c18a079d232280c2701fb20d36f75d379e03.zip frameworks_base-7699c18a079d232280c2701fb20d36f75d379e03.tar.gz frameworks_base-7699c18a079d232280c2701fb20d36f75d379e03.tar.bz2 | |
Merge "when disconnectHeadsetInternal, allow it when the BT is not disabled"
| -rw-r--r-- | core/java/android/bluetooth/BluetoothHeadset.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothHeadset.java b/core/java/android/bluetooth/BluetoothHeadset.java index 3284361..8f2b3d8 100644 --- a/core/java/android/bluetooth/BluetoothHeadset.java +++ b/core/java/android/bluetooth/BluetoothHeadset.java @@ -661,7 +661,7 @@ public final class BluetoothHeadset implements BluetoothProfile { */ public boolean disconnectHeadsetInternal(BluetoothDevice device) { if (DBG) log("disconnectHeadsetInternal"); - if (mService != null && isEnabled()) { + if (mService != null && !isDisabled()) { try { return mService.disconnectHeadsetInternal(device); } catch (RemoteException e) {Log.e(TAG, e.toString());} |