Merge "Don't send the onServiceDisconnected callback after close." into lmp-mr1-dev

1 files changed, 1 insertions, 6 deletions

diff --git a/core/java/android/bluetooth/BluetoothHeadset.java b/core/java/android/bluetooth/BluetoothHeadset.java
index 546a50e2ef4a..25d9aa9bae67 100644
--- a/core/java/android/bluetooth/BluetoothHeadset.java
+++ b/core/java/android/bluetooth/BluetoothHeadset.java
@@ -229,7 +229,6 @@ public final class BluetoothHeadset implements BluetoothProfile {
     private ServiceListener mServiceListener;
     private IBluetoothHeadset mService;
     private BluetoothAdapter mAdapter;
-    private boolean mIsClosed;
 
     final private IBluetoothStateChangeCallback mBluetoothStateChangeCallback =
             new IBluetoothStateChangeCallback.Stub() {
@@ -260,7 +259,6 @@ public final class BluetoothHeadset implements BluetoothProfile {
         mContext = context;
         mServiceListener = l;
         mAdapter = BluetoothAdapter.getDefaultAdapter();
-        mIsClosed = false;
 
         IBluetoothManager mgr = mAdapter.getBluetoothManager();
         if (mgr != null) {
@@ -314,7 +312,7 @@ public final class BluetoothHeadset implements BluetoothProfile {
                 Log.e(TAG,"",e);
             }
         }
-        mIsClosed = true;
+        mServiceListener = null;
         doUnbind();
     }
 
@@ -983,9 +981,6 @@ public final class BluetoothHeadset implements BluetoothProfile {
                     if (mServiceListener != null) {
                         mServiceListener.onServiceDisconnected(BluetoothProfile.HEADSET);
                     }
-                    if (mIsClosed){
-                        mServiceListener = null;
-                    }
                     break;
                 }
             }