Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid IllegalArgumentException when bluetooth is disabled"

Browse Source 
am: 2a1bdd2429

Change-Id: I536b4ca701bed102c5c2914a6dbfa2393a646c6d
This commit is contained in:
Deqiang Chen
2019-03-14 15:41:33 -07:00
committed by android-build-merger
parent 614f1e0bba 2a1bdd2429
commit 787e52045f
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/bluetooth/BluetoothA2dp.java
View File

@@ -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 {

2
core/java/android/bluetooth/BluetoothHidHost.java
View File

@@ -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);
} }

2
core/java/android/bluetooth/BluetoothPbap.java
View File

@@ -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);
} }