Merge "Fix BLE scan leaks" into oc-dr1-dev am: 604a4b7171 am: 7d06d7bd79

am: 0fc48f2d37 Change-Id: I4952bd5792d1c7d62ff7bf1ac3be9166b794ce49
2017-07-29 22:32:32 +00:00
parent dd302e2955 0fc48f2d37
commit 56768fcd28
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 {