commit | b7e2c502142c9ef12fc847813fc3fbe40ad68cf8 | [log] [tgz] |
---|---|---|
author | Vinay Kalia <vinaykalia@google.com> | Sat Jul 29 22:17:06 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Jul 29 22:17:06 2017 +0000 |
tree | 43284f35873124e79aebd0217993ebf7728a342e | |
parent | d0ea5528fe6bd6ff3cfb00a72fc98a11cac2e598 [diff] | |
parent | 604a4b71711adb5a04aab6c10b51f2415d0317f7 [diff] |
Merge "Fix BLE scan leaks" into oc-dr1-dev am: 604a4b7171 Change-Id: I65e4990a08cc59ce30ee6d987f13a0381b42e58f
diff --git a/core/java/android/bluetooth/le/BluetoothLeScanner.java b/core/java/android/bluetooth/le/BluetoothLeScanner.java index 1eac395..e3bc78e 100644 --- a/core/java/android/bluetooth/le/BluetoothLeScanner.java +++ b/core/java/android/bluetooth/le/BluetoothLeScanner.java
@@ -205,7 +205,8 @@ } synchronized (mLeScanClients) { if (callback != null && mLeScanClients.containsKey(callback)) { - postCallbackError(callback, ScanCallback.SCAN_FAILED_ALREADY_STARTED); + return postCallbackErrorOrReturn(callback, + ScanCallback.SCAN_FAILED_ALREADY_STARTED); } IBluetoothGatt gatt; try {