summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-06-22 01:14:12 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-06-22 01:14:18 +0000
commit78f3a0f722da7c1942e8f58e1673261bf640de60 (patch)
tree34a4f048e285710cd41c7a22e8d09038dc0b1b5f
parentf044e0b87f1407847c48eb2092a0dfaf5f527320 (diff)
parent9622137f3f5766408c82752f50a3dd8af6cd2134 (diff)
Merge "Clarify startScan API on how to get results" into oc-dev
-rw-r--r--core/java/android/bluetooth/le/BluetoothLeScanner.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/bluetooth/le/BluetoothLeScanner.java b/core/java/android/bluetooth/le/BluetoothLeScanner.java
index f3f0ae5cd959..1eac395bd06c 100644
--- a/core/java/android/bluetooth/le/BluetoothLeScanner.java
+++ b/core/java/android/bluetooth/le/BluetoothLeScanner.java
@@ -136,6 +136,11 @@ public final class BluetoothLeScanner {
* Start Bluetooth LE scan using a {@link PendingIntent}. The scan results will be delivered via
* the PendingIntent. Use this method of scanning if your process is not always running and it
* should be started when scan results are available.
+ * <p>
+ * When the PendingIntent is delivered, the Intent passed to the receiver or activity
+ * will contain one or more of the extras {@link #EXTRA_CALLBACK_TYPE},
+ * {@link #EXTRA_ERROR_CODE} and {@link #EXTRA_LIST_SCAN_RESULT} to indicate the result of
+ * the scan.
*
* @param filters Optional list of ScanFilters for finding exact BLE devices.
* @param settings Optional settings for the scan.