summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-07-29 22:08:36 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-07-29 22:08:36 +0000
commit604a4b71711adb5a04aab6c10b51f2415d0317f7 (patch)
tree1f0a9e1e64b568ac5e00c9f7a26de591373b4315
parentea999548045f722f007451c174237e97c766710d (diff)
parent9722971cb4a79e37165f636f9dd057707d2e620a (diff)
Merge "Fix BLE scan leaks" into oc-dr1-dev
-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 {