diff options
| author | Marie Janssen <jamuraa@google.com> | 2016-08-09 13:23:39 -0700 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2016-09-27 15:58:47 -0700 |
| commit | 26f6eb78a61323cb2cae055ee0cee62c95a8f85e (patch) | |
| tree | 31aa881392e34956ab2731b4555ca3f2e6f18612 | |
| parent | 23e6629cf56378634488ea49a8acf40d709effa1 (diff) | |
| download | frameworks_base-26f6eb78a61323cb2cae055ee0cee62c95a8f85e.zip frameworks_base-26f6eb78a61323cb2cae055ee0cee62c95a8f85e.tar.gz frameworks_base-26f6eb78a61323cb2cae055ee0cee62c95a8f85e.tar.bz2 | |
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: I887de32d156e672ec44aa0b286cd7ea7f9f8ad55
(cherry picked from commit 93326cfd9fb8a20081baa9b975275772798cfd80)
| -rw-r--r-- | core/java/android/bluetooth/BluetoothDevice.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index d27dfa0..f7e2504 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -1153,12 +1153,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"); |