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

Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev

Browse Source
This commit is contained in:
Matthew Xie
2015-02-09 21:50:56 +00:00
committed by Android (Google) Code Review
parent 6e3de6a19a 60675b2273
commit a63ba4287e
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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