From ee31c78cb89dad69a6da6a79f35ac1b245773b50 Mon Sep 17 00:00:00 2001
From: Rahul Sabnis <rahulsabnis@google.com>
Date: Fri, 1 May 2020 15:00:00 -0700
Subject: [PATCH] BluetoothProfileConnecter now calls the ServiceListener's
 onServiceDisconnected method after unbinding the service

Bug: 155120232
Test: atest BluetoothHostTest#testMapClose
Change-Id: I324b4ea6654261eb67d5ec184f6b3456ba3d1aa4
---
 .../bluetooth/BluetoothProfileConnector.java  | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/core/java/android/bluetooth/BluetoothProfileConnector.java b/core/java/android/bluetooth/BluetoothProfileConnector.java
index 863fd3698cbd1..040f58ae4863a 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 {