commit cd460538a4e00cd36be478b00d298a6e2526528f
author Andre Eisenbach <eisenbach@google.com> Tue Dec 16 17:16:53 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 16 17:16:55 2014 +0000
tree a2556623148c81e97b68c2b33c8897f2cb294b4b
parent 052e9b12f5fc7a1e3ecdd126ca8c07298941f291
parent c88b6bdcfada95447269b41d388fd7028dba574b

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

core/java/android/bluetooth/BluetoothHeadset.java

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