OSDN Git Service

Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27...
authorMarie Janssen <jamuraa@google.com>
Wed, 21 Sep 2016 02:24:18 +0000 (02:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Sep 2016 02:24:18 +0000 (02:24 +0000)
am: 5742a055e2

Change-Id: If850d33567371bc2a9bd4e2394b90ea84066b602

core/java/android/bluetooth/BluetoothDevice.java

index 189147e..6d6dfeb 100644 (file)
@@ -1167,12 +1167,12 @@ public final class BluetoothDevice implements Parcelable {
 
     /**
      * Confirm passkey for {@link #PAIRING_VARIANT_PASSKEY_CONFIRMATION} pairing.
-     * <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}.
+     * <p>Requires {@link android.Manifest.permission#BLUETOOTH_PRIVILEGED}.
      *
      * @return true confirmation has been sent out
      *         false for error
      */
-    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
+    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)
     public boolean setPairingConfirmation(boolean confirm) {
         if (sService == null) {
             Log.e(TAG, "BT not enabled. Cannot set pairing confirmation");