commit 1199972de15e6b2ceabf61be15867c312d9b8fb0
author Vinay Kalia <vinaykalia@google.com> Wed Aug 09 21:10:53 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 09 21:10:53 2017 +0000
tree a971435ea5528f5402cbb19441b3a5c2ffd78579
parent 272a45e493c4e9915ea4803d4e71d32a76a7e4f2
parent 6e749c392bb99be5eb0d4b1819222beefbba33d0

Merge "Fix BLE scan leaks" into oc-dev
am: 6e749c392b

Change-Id: Id43b33865e287ec19a2ae4c56815d12bb402ab09

core/java/android/bluetooth/le/BluetoothLeScanner.java

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 {