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

am e2502eb9: Merge "Fix crash during Bluetooth on/off stress test" into lmp-mr1-dev

Browse Source 
* commit 'e2502eb9ad5eafc54ae06f06a72493748616dbd5':
  Fix crash during Bluetooth on/off stress test
This commit is contained in:
Andre Eisenbach
2014-10-29 22:54:10 +00:00
committed by Android Git Automerger
parent 3be4e43b4c e2502eb9ad
commit dfc472542f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1445,7 +1445,7 @@ public final class BluetoothAdapter {
if (VDBG) Log.d(TAG, "onBluetoothServiceDown: " + mService); if (VDBG) Log.d(TAG, "onBluetoothServiceDown: " + mService);
synchronized (mManagerCallback) { synchronized (mManagerCallback) {
mService = null; mService = 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();
for (IBluetoothManagerCallback cb : mProxyServiceStateCallbacks ){ for (IBluetoothManagerCallback cb : mProxyServiceStateCallbacks ){