diff options
| author | Andre Eisenbach <eisenbach@google.com> | 2014-10-29 12:13:38 -0700 |
|---|---|---|
| committer | Jeff Deng <jeffdeng@google.com> | 2014-11-07 00:19:45 +0000 |
| commit | df11d588bb26ad0e8b8a6e8551393a0abeec2fef (patch) | |
| tree | d96e44c1bf41cb5ea501536e75cb658ee5f43cbc /core/java/android | |
| parent | db21261339f37666a23b5d1e7f8997af4439c0c2 (diff) | |
| download | frameworks_base-df11d588bb26ad0e8b8a6e8551393a0abeec2fef.zip frameworks_base-df11d588bb26ad0e8b8a6e8551393a0abeec2fef.tar.gz frameworks_base-df11d588bb26ad0e8b8a6e8551393a0abeec2fef.tar.bz2 | |
Fix crash during Bluetooth on/off stress test
Bug: 18106938
Change-Id: Icdeb736d89d5926264f2043455ccbc3760fd5d29
(cherry picked from commit 178d3b54cd50558be789c5dfd8dad80ffdc65021)
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothAdapter.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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 ){ |