commit 3667b7122557ef15fcacf267133bdd3eae4c0737
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Sep 14 03:04:37 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 14 03:04:37 2018 +0000
tree 4feb3a2b59dc5dc98c4db60b11b4a88f8375976d
parent 206a50673d7d6d05a688c879c6022227a9f43326
parent 009103c67512f59ec7c7b7aaca170d7f0de5738b

Merge "Add note for FLAG_CANCEL_CURRENT when stopping scan" into pi-dev

core/java/android/bluetooth/le/BluetoothLeScanner.java

diff --git a/core/java/android/bluetooth/le/BluetoothLeScanner.java b/core/java/android/bluetooth/le/BluetoothLeScanner.java
index 347fc4d..804cf9a 100644
--- a/core/java/android/bluetooth/le/BluetoothLeScanner.java
+++ b/core/java/android/bluetooth/le/BluetoothLeScanner.java
@@ -275,7 +275,9 @@
     }
 
     /**
-     * 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)