Snap for 6457311 from 4ad02bcaeb8a85a11e77d6afd96e92b97b051e58 to mainline-release (158c61bc) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothProfileConnector.java

+15 −9

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ public abstract class BluetoothProfileConnector<T> {

		private void doUnbind() {
		synchronized (mConnection) {
		try {
		if (mService != null) {
		logDebug("Unbinding service...");
		try {
		@@ -113,6 +114,12 @@ public abstract class BluetoothProfileConnector<T> {
		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 {