Merge "Fix BLE scan leaks" into oc-dr1-dev

am: 604a4b7171 Change-Id: I9e3f7a0d3b871e5c5e2a740ec69eacaa2cbc41e2
2017-07-29 22:17:03 +00:00
parent 567fe364d4 604a4b7171
commit 7d06d7bd79
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/bluetooth/le/BluetoothLeScanner.java
+++ b/core/java/android/bluetooth/le/BluetoothLeScanner.java
@@ -205,7 +205,8 @@ public final class BluetoothLeScanner {
        }
        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 {