summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hansong Zhang <hsz@google.com> 2018-11-20 18:23:10 -0800
committer android-build-merger <android-build-merger@google.com> 2018-11-20 18:23:10 -0800
commita7063f1830280e180a1fa0dff4bd7446d6a8f767 (patch)
treedaade34f57d4e8290c541ce4590440f5df21529e
parent56f272547fd45bbd5242adbb7b3d6a82e110bdc5 (diff)
parent652dffda0b813694ef803a7bd91b6247041c0240 (diff)
Merge "BluetoothDevice.ACTION_UUID requires BLUETOOTH_ADMIN" am: 215a48cff4
am: 652dffda0b Change-Id: I7ea71f54d211bf4656472b9a40cd6996507eaa18
-rw-r--r--core/java/android/bluetooth/BluetoothDevice.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
index 0aa053580a6d..235dc5c59c2a 100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -347,7 +347,7 @@ public final class BluetoothDevice implements Parcelable {
* device are requested to be fetched using Service Discovery Protocol
* <p> Always contains the extra field {@link #EXTRA_DEVICE}
* <p> Always contains the extra field {@link #EXTRA_UUID}
- * <p>Requires {@link android.Manifest.permission#BLUETOOTH} to receive.
+ * <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN} to receive.
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_UUID =