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

Commit 981551ae authored Mar 14, 2019 by Deqiang Chen Committed by android-build-merger Mar 14, 2019

Merge "Avoid IllegalArgumentException when bluetooth is disabled"

am: 4b7400c3

Change-Id: I536b4ca701bed102c5c2914a6dbfa2393a646c6d

parents 76fb1286 4b7400c3

framework/java/android/bluetooth/BluetoothA2dp.java

+4 −2

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

framework/java/android/bluetooth/BluetoothHidHost.java

+4 −2

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

framework/java/android/bluetooth/BluetoothPbap.java

+4 −2

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