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

* commit '8018fae1c1747f0b940276650987aa68e9a16345':
  Fix crash during Bluetooth on/off stress test
This commit is contained in:
Andre Eisenbach
2014-10-31 00:00:29 +00:00
committed by Android Git Automerger

View File

@@ -1445,7 +1445,7 @@ public final class BluetoothAdapter {
if (VDBG) Log.d(TAG, "onBluetoothServiceDown: " + mService);
synchronized (mManagerCallback) {
mService = null;
mLeScanClients.clear();
if (mLeScanClients != null) mLeScanClients.clear();
if (sBluetoothLeAdvertiser != null) sBluetoothLeAdvertiser.cleanup();
if (sBluetoothLeScanner != null) sBluetoothLeScanner.cleanup();
for (IBluetoothManagerCallback cb : mProxyServiceStateCallbacks ){