commit bf11fae04e268c24a3d6d4c50c2ee6c8e514d4e9
author Marie Janssen <jamuraa@google.com> Wed Sep 21 02:24:18 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 21 02:24:18 2016 +0000
tree 14deebcedd6ae4301e9f51a1b5a5f5221f7366de
parent 85973e91d2f88b43b500481c9f6216d0d349ac81
parent 5742a055e2b408a48b74ac950ca1d09fbeb7201f

Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048 am: 532d2b11a3 am: 6f514cc82b
am: 5742a055e2

Change-Id: If850d33567371bc2a9bd4e2394b90ea84066b602

core/java/android/bluetooth/BluetoothDevice.java

diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
index 189147e..6d6dfeb 100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -1167,12 +1167,12 @@
 
     /**
      * 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");