summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Marie Janssen <jamuraa@google.com> 2016-09-21 01:59:29 +0000
committer android-build-merger <android-build-merger@google.com> 2016-09-21 01:59:29 +0000
commitdbb8ffc47d626eaeffc09f6095882fe6f97b29ee (patch)
tree92bcae3e7fd58fd320c7e87a983fcc6293c1d3b6
parent373812e7ee43b8b8f6aebab69794c54b2a739b4d (diff)
parent6f514cc82b325bc1756f27ab27e86595c997a853 (diff)
Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048 am: 532d2b11a3
am: 6f514cc82b Change-Id: I88928de86c08a148b3124c616b309862da1a1c24
-rw-r--r--core/java/android/bluetooth/BluetoothDevice.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
index 189147efa829..6d6dfebced2c 100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -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");