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

am: 7d06d7bd79 Change-Id: I54ff5a6a0ccc29a2e4acb9983c0610f18c9f7950
2017-07-29 22:24:24 +00:00
parent fdf0a16758 7d06d7bd79
commit 0fc48f2d37
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 {