Snap for 6462261 from 61cdf605db2832ea3cc7e2db7b4fa728038dd00a to mainline-release (b335a77e) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothProfileConnector.java

+9 −15

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

		private void doUnbind() {
		synchronized (mConnection) {
		try {
		if (mService != null) {
		logDebug("Unbinding service...");
		try {
		@@ -114,12 +113,6 @@ public abstract class BluetoothProfileConnector<T> {
		mService = null;
		}
		}
		} finally {
		if (mServiceListener != null) {
		mServiceListener.onServiceDisconnected(mProfileId);
		mServiceListener = null;
		}
		}
		}
		}

		@@ -138,6 +131,7 @@ public abstract class BluetoothProfileConnector<T> {
		}

		void disconnect() {
		mServiceListener = null;
		IBluetoothManager mgr = BluetoothAdapter.getDefaultAdapter().getBluetoothManager();
		if (mgr != null) {
		try {