Merge "Revert "BluetoothProfileConnecter now calls the ServiceListener'..."" into rvc-dev (1c85c450) · Commits · e / os / android_frameworks_base

core/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 {