summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Stanley Tng <stng@google.com> 2018-08-21 13:28:17 -0700
committer android-build-merger <android-build-merger@google.com> 2018-08-21 13:28:17 -0700
commitcf825b33a0ebcfd61e79ad44f5491df2a6fc3a24 (patch)
treeb937e871833956b6bdb799e0934c2aeb2c10d13b
parent6a403d8d5b326762711b6fb0c131376ae00a01e3 (diff)
parentd63c1209ed5409155fc4daa109edde3ac3c4a37f (diff)
Merge "Add note for FLAG_CANCEL_CURRENT when stopping scan" am: 041eb388de
am: d63c1209ed Change-Id: Ib478500a29875f6a1bedac00add19c37f979e55d
-rw-r--r--core/java/android/bluetooth/le/BluetoothLeScanner.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/le/BluetoothLeScanner.java b/core/java/android/bluetooth/le/BluetoothLeScanner.java
index 347fc4df4ebb..804cf9a90712 100644
--- a/core/java/android/bluetooth/le/BluetoothLeScanner.java
+++ b/core/java/android/bluetooth/le/BluetoothLeScanner.java
@@ -275,7 +275,9 @@ public final class BluetoothLeScanner {
}
/**
- * Stops an ongoing Bluetooth LE scan started using a PendingIntent.
+ * Stops an ongoing Bluetooth LE scan started using a PendingIntent. When creating the
+ * PendingIntent parameter, please do not use the FLAG_CANCEL_CURRENT flag. Otherwise, the stop
+ * scan may have no effect.
*
* @param callbackIntent The PendingIntent that was used to start the scan.
* @see #startScan(List, ScanSettings, PendingIntent)