diff options
| author | Hansong Zhang <hsz@google.com> | 2018-11-20 18:12:47 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-20 18:12:47 -0800 |
| commit | e366b162b3a16fbef860e0e4e820fe76e380cfc4 (patch) | |
| tree | 6b050bb252f4414715f40fb68dd33e1309a0d02a /framework/java/android | |
| parent | 7c4bcb1adc65e8c777f7870add2357cf42acba9f (diff) | |
| parent | 1a80595b971f1a33df109970b997e5d9367115ca (diff) | |
Merge "BluetoothDevice.ACTION_UUID requires BLUETOOTH_ADMIN"
am: 1a80595b97
Change-Id: Iaa2e3b28a3dec540b5b5ffb3fcda13ac6e020876
Diffstat (limited to 'framework/java/android')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothDevice.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/java/android/bluetooth/BluetoothDevice.java b/framework/java/android/bluetooth/BluetoothDevice.java index d9e6fa2038..b2b02850e2 100644 --- a/framework/java/android/bluetooth/BluetoothDevice.java +++ b/framework/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 = |