summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Edward Jee <edjee@google.com> 2013-10-10 20:07:41 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2013-10-10 20:07:41 +0000
commit208c42dfee004fea66c9d91fd018210a530d844e (patch)
tree169a946ffb5b8246c233af455ac113413ea8da38
parent97fee8186789beb281d1dcfcd0d69f885a2a1e3e (diff)
parent430e361b202ecff8a10a9258948ade99689fe6b1 (diff)
Merge "Makes ACTION_PAIRING_REQUEST require BLUETOOTH_PRIVILEGED." into klp-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 5eb642cafb09..5822e468b36b 100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -322,7 +322,8 @@ public final class BluetoothDevice implements Parcelable {
/**
* Broadcast Action: This intent is used to broadcast PAIRING REQUEST
- * <p>Requires {@link android.Manifest.permission#BLUETOOTH} to receive.
+ * <p>Requires {@link android.Manifest.permission#BLUETOOTH_PRIVILEGED} to
+ * receive.
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_PAIRING_REQUEST =