summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vinay Kalia <vinaykalia@google.com> 2017-07-29 22:17:03 +0000
committer android-build-merger <android-build-merger@google.com> 2017-07-29 22:17:03 +0000
commit7d06d7bd7931ddec00b63aa080bd30a3e4b4c15d (patch)
treee04e8ac14f522f9ea45d2e9e8653720b7bb7dd6f
parent567fe364d43579f5d807b18facdcc4e2d2e896bf (diff)
parent604a4b71711adb5a04aab6c10b51f2415d0317f7 (diff)
Merge "Fix BLE scan leaks" into oc-dr1-dev
am: 604a4b7171 Change-Id: I9e3f7a0d3b871e5c5e2a740ec69eacaa2cbc41e2
-rw-r--r--core/java/android/bluetooth/le/BluetoothLeScanner.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/le/BluetoothLeScanner.java b/core/java/android/bluetooth/le/BluetoothLeScanner.java
index 1eac395bd06c..e3bc78e5a2bb 100644
--- 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 {