Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b7400c3 authored Mar 14, 2019 by Deqiang Chen Committed by Gerrit Code Review Mar 14, 2019

Merge "Avoid IllegalArgumentException when bluetooth is disabled"

parents 41069325 16441d05

framework/java/android/bluetooth/BluetoothA2dp.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -224,8 +224,10 @@ public final class BluetoothA2dp implements BluetoothProfile {
		if (VDBG) Log.d(TAG, "Unbinding service...");
		try {
		mServiceLock.writeLock().lock();
		if (mService != null) {
		mService = null;
		mContext.unbindService(mConnection);
		}
		} catch (Exception re) {
		Log.e(TAG, "", re);
		} finally {

framework/java/android/bluetooth/BluetoothHidHost.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -232,8 +232,10 @@ public final class BluetoothHidHost implements BluetoothProfile {
		if (VDBG) Log.d(TAG, "Unbinding service...");
		synchronized (mConnection) {
		try {
		if (mService != null) {
		mService = null;
		mContext.unbindService(mConnection);
		}
		} catch (Exception re) {
		Log.e(TAG, "", re);
		}

framework/java/android/bluetooth/BluetoothPbap.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -120,8 +120,10 @@ public class BluetoothPbap implements BluetoothProfile {
		log("Unbinding service...");
		synchronized (mConnection) {
		try {
		if (mService != null) {
		mService = null;
		mContext.unbindService(mConnection);
		}
		} catch (Exception re) {
		Log.e(TAG, "", re);
		}