commit e2502eb9ad5eafc54ae06f06a72493748616dbd5
author Andre Eisenbach <eisenbach@google.com> Wed Oct 29 19:35:17 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 29 19:35:19 2014 +0000
tree a9dc09df3e098bcfefe7f307c6cbc5e1de959b39
parent 543a82edd5a0a921570335e71004f33a3a68438f
parent 178d3b54cd50558be789c5dfd8dad80ffdc65021

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

core/java/android/bluetooth/BluetoothAdapter.java

diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java
index f2e03cf..c262bae 100644
--- a/core/java/android/bluetooth/BluetoothAdapter.java
+++ b/core/java/android/bluetooth/BluetoothAdapter.java
@@ -1445,7 +1445,7 @@
                 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 ){