Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7063f18 authored by Hansong Zhang's avatar Hansong Zhang Committed by android-build-merger
Browse files

Merge "BluetoothDevice.ACTION_UUID requires BLUETOOTH_ADMIN" am: 215a48cf 

am: 652dffda

Change-Id: I7ea71f54d211bf4656472b9a40cd6996507eaa18
parents 56f27254 652dffda

core/java/android/bluetooth/BluetoothDevice.java

+1 −1
Original line number Diff line number Diff line
@@ -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 =