Merge "BluetoothProfileConnecter now calls the ServiceListener's onServiceDisconnected method after unbinding the service" into rvc-dev

1 files changed, 15 insertions, 9 deletions

diff --git a/core/java/android/bluetooth/BluetoothProfileConnector.java b/core/java/android/bluetooth/BluetoothProfileConnector.java
index 863fd3698cbd..040f58ae4863 100644
--- a/core/java/android/bluetooth/BluetoothProfileConnector.java
+++ b/core/java/android/bluetooth/BluetoothProfileConnector.java
@@ -103,14 +103,21 @@ public abstract class BluetoothProfileConnector<T> {
 
     private void doUnbind() {
         synchronized (mConnection) {
-            if (mService != null) {
-                logDebug("Unbinding service...");
-                try {
-                    mContext.unbindService(mConnection);
-                } catch (IllegalArgumentException ie) {
-                    logError("Unable to unbind service: " + ie);
-                } finally {
-                    mService = null;
+            try {
+                if (mService != null) {
+                    logDebug("Unbinding service...");
+                    try {
+                        mContext.unbindService(mConnection);
+                    } catch (IllegalArgumentException ie) {
+                        logError("Unable to unbind service: " + ie);
+                    } finally {
+                        mService = null;
+                    }
+                }
+            } finally {
+                if (mServiceListener != null) {
+                    mServiceListener.onServiceDisconnected(mProfileId);
+                    mServiceListener = null;
                 }
             }
         }
@@ -131,7 +138,6 @@ public abstract class BluetoothProfileConnector<T> {
     }
 
     void disconnect() {
-        mServiceListener = null;
         IBluetoothManager mgr = BluetoothAdapter.getDefaultAdapter().getBluetoothManager();
         if (mgr != null) {
             try {