diff options
| author | Stanley Tng <stng@google.com> | 2018-08-21 13:50:49 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-21 13:50:49 -0700 |
| commit | 9c67f096fecab30afef37f0cd31ffc2dcd900bdf (patch) | |
| tree | 059ed6f857d98bf5d5206bb9bf9a050a60d804d2 /framework/java/android/bluetooth/le/BluetoothLeScanner.java | |
| parent | e0c6726357976edbc0d743442a564f08f7712458 (diff) | |
| parent | ff0bb06f52d820072e6afb310ad5d090de1429a1 (diff) | |
Merge "Add note for FLAG_CANCEL_CURRENT when stopping scan" am: ff0bb06f52 am: d63c1209ed
am: cf825b33a0
Change-Id: I9d7ade22e528dac625debb580b0ebc54022b83a1
Diffstat (limited to 'framework/java/android/bluetooth/le/BluetoothLeScanner.java')
| -rw-r--r-- | framework/java/android/bluetooth/le/BluetoothLeScanner.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/framework/java/android/bluetooth/le/BluetoothLeScanner.java b/framework/java/android/bluetooth/le/BluetoothLeScanner.java index f5e2a09ee3..ac126ae096 100644 --- a/framework/java/android/bluetooth/le/BluetoothLeScanner.java +++ b/framework/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) |