summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAjay Panicker <apanicke@google.com>2016-09-08 11:01:29 -0700
committerAndreas Blaesius <skate4life@gmx.de>2016-11-20 13:40:28 +0100
commitdfa6c1c0238bd25daa66551bad103a399eb4fa2b (patch)
tree9ec27517f3b40d8711156dbbaf3aa75b2dc72c0e
parentef36327a00533a64aebaef51053cf27ff679283b (diff)
downloadandroid_frameworks_base-dfa6c1c0238bd25daa66551bad103a399eb4fa2b.tar.gz
android_frameworks_base-dfa6c1c0238bd25daa66551bad103a399eb4fa2b.tar.bz2
android_frameworks_base-dfa6c1c0238bd25daa66551bad103a399eb4fa2b.zip
Fix setPairingConfirmation permissions issue (2/2)
setPairingConfirmation was set to only require BLUETOOTH_ADMIN permission which shouldn't be able to set the confirmation itself. This is restricted to BLUETOOTH_PRIVILEGED permission. Bug: 29043989 Change-Id: Iddc935f0b02f5ff56e930914b4b664377e786184 (cherry picked from commit edae39d59aa2155c2d79cca991e163e2284cc355)
-rw-r--r--core/java/android/bluetooth/BluetoothDevice.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
index 6b4cd3ed538..71148180cbd 100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -1023,7 +1023,7 @@ 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