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

Separate the protection of mProxyServiceStateCallbacks from that of mService

Browse Source 
The overuse of mManagerCallback caused a deaklock.
Bug: 19264190

Change-Id: Iff20019ff0c99bb5f36435feb15e43e280a8e102
This commit is contained in:
Matthew Xie
2015-02-06 14:09:54 -08:00
parent f789d45b24
commit 60675b2273
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
core/java/android/bluetooth/BluetoothAdapter.java
View File

@@ -1429,14 +1429,16 @@ public final class BluetoothAdapter {
if (VDBG) Log.d(TAG, "onBluetoothServiceUp: " + bluetoothService);
synchronized (mManagerCallback) {
mService = bluetoothService;
for (IBluetoothManagerCallback cb : mProxyServiceStateCallbacks ){
try {
if (cb != null) {
cb.onBluetoothServiceUp(bluetoothService);
} else {
Log.d(TAG, "onBluetoothServiceUp: cb is null!!!");
}
} catch (Exception e) { Log.e(TAG,"",e);}
synchronized (mProxyServiceStateCallbacks) {
for (IBluetoothManagerCallback cb : mProxyServiceStateCallbacks ){
try {
if (cb != null) {
cb.onBluetoothServiceUp(bluetoothService);
} else {
Log.d(TAG, "onBluetoothServiceUp: cb is null!!!");
}
} catch (Exception e) { Log.e(TAG,"",e);}
}
}
}
}
@@ -1448,14 +1450,16 @@ public final class BluetoothAdapter {
if (mLeScanClients != null) mLeScanClients.clear();
if (sBluetoothLeAdvertiser != null) sBluetoothLeAdvertiser.cleanup();
if (sBluetoothLeScanner != null) sBluetoothLeScanner.cleanup();
for (IBluetoothManagerCallback cb : mProxyServiceStateCallbacks ){
try {
if (cb != null) {
cb.onBluetoothServiceDown();
} else {
Log.d(TAG, "onBluetoothServiceDown: cb is null!!!");
}
} catch (Exception e) { Log.e(TAG,"",e);}
synchronized (mProxyServiceStateCallbacks) {
for (IBluetoothManagerCallback cb : mProxyServiceStateCallbacks ){
try {
if (cb != null) {
cb.onBluetoothServiceDown();
} else {
Log.d(TAG, "onBluetoothServiceDown: cb is null!!!");
}
} catch (Exception e) { Log.e(TAG,"",e);}
}
}
}
}
@@ -1596,10 +1600,10 @@ public final class BluetoothAdapter {
return mManagerService;
}
private ArrayList<IBluetoothManagerCallback> mProxyServiceStateCallbacks = new ArrayList<IBluetoothManagerCallback>();
final private ArrayList<IBluetoothManagerCallback> mProxyServiceStateCallbacks = new ArrayList<IBluetoothManagerCallback>();
/*package*/ IBluetooth getBluetoothService(IBluetoothManagerCallback cb) {
synchronized (mManagerCallback) {
synchronized (mProxyServiceStateCallbacks) {
if (cb == null) {
Log.w(TAG, "getBluetoothService() called with no BluetoothManagerCallback");
} else if (!mProxyServiceStateCallbacks.contains(cb)) {
@@ -1610,7 +1614,7 @@ public final class BluetoothAdapter {
}
/*package*/ void removeServiceStateCallback(IBluetoothManagerCallback cb) {
synchronized (mManagerCallback) {
synchronized (mProxyServiceStateCallbacks) {
mProxyServiceStateCallbacks.remove(cb);
}
}