summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Fyodor Kupolov <fkupolov@google.com> 2015-07-15 01:34:37 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-07-15 01:34:43 +0000
commit4044440d2c1a9d185a3379b88d88c96f8e234887 (patch)
tree6ddd10963cb4193918838dd485615338908f2d4a
parentbd874b8be717110148e2b284f35d166b11c1fe7d (diff)
parent72f491dd8642e6854fd4c6d40d77c06312af6e3b (diff)
Merge "Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast" into mnc-dev
-rw-r--r--core/java/android/bluetooth/BluetoothDevice.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
index c96fe71e7974..d27dfa04faf0 100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -92,7 +92,8 @@ public final class BluetoothDevice implements Parcelable {
* <p>Always contains the extra fields {@link #EXTRA_DEVICE} and {@link
* #EXTRA_CLASS}. Can contain the extra fields {@link #EXTRA_NAME} and/or
* {@link #EXTRA_RSSI} if they are available.
- * <p>Requires {@link android.Manifest.permission#BLUETOOTH} to receive.
+ * <p>Requires {@link android.Manifest.permission#BLUETOOTH} and
+ * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION} to receive.
*/
// TODO: Change API to not broadcast RSSI if not available (incoming connection)
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)