summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Amith Yamasani <yamasani@google.com> 2017-09-08 02:39:11 +0000
committer android-build-merger <android-build-merger@google.com> 2017-09-08 02:39:11 +0000
commita2207908558ef637f91432e48a671a60c24eaeec (patch)
tree52b8a1f15c08ac4e4121ea0dad578b0656d0e9f1
parent19e83f3983d76b35b5116b2bbd867d3160f7f7b2 (diff)
parent2ce2f84999cc3e627d4f6aed316b50ae7179b004 (diff)
Merge "Javadoc update for permission requirements" into oc-mr1-dev
am: 2ce2f84999 Change-Id: I6703ab1128202f5928d574c55d0f4a9129c95b60
-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 7fc79d79a641..a189e271379a 100644
--- a/core/java/android/bluetooth/le/BluetoothLeScanner.java
+++ b/core/java/android/bluetooth/le/BluetoothLeScanner.java
@@ -143,6 +143,11 @@ public final class BluetoothLeScanner {
* 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>
+ * An app must hold
+ * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_COARSE_LOCATION} or
+ * {@link android.Manifest.permission#ACCESS_FINE_LOCATION ACCESS_FINE_LOCATION} permission
+ * in order to get results.
+ * <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