diff options
| author | Ajay Panicker <apanicke@google.com> | 2016-09-08 10:55:51 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-11-16 15:19:34 -0700 |
| commit | bb760036a166bd75f7a48e6d18880a7364dd61af (patch) | |
| tree | 736a28637e222c638500b02863dd4fc2dc9c5aae | |
| parent | 9b77e785aaa02479623d14d4dc9d1f6931fdbd1f (diff) | |
| download | android_packages_apps_Bluetooth-bb760036a166bd75f7a48e6d18880a7364dd61af.tar.gz android_packages_apps_Bluetooth-bb760036a166bd75f7a48e6d18880a7364dd61af.tar.bz2 android_packages_apps_Bluetooth-bb760036a166bd75f7a48e6d18880a7364dd61af.zip | |
Fix setPairingConfirmation permissions issue (1/2)stable/cm-12.1-YOG7D
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.
CYNGNOS-3303
Bug: 29043989
Change-Id: Iae8e31b25795989446265fdcc5eb27e6ffaf29aa
(cherry picked from commit 554f13336ef3e9b96f7e912c562935903bc6be75)
(cherry picked from commit e7095a79e346d99036386c09063a288660cf6ba3)
| -rw-r--r-- | src/com/android/bluetooth/btservice/AdapterService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java index f84409c93..2b96572e5 100644 --- a/src/com/android/bluetooth/btservice/AdapterService.java +++ b/src/com/android/bluetooth/btservice/AdapterService.java @@ -1818,8 +1818,8 @@ public class AdapterService extends Service { } boolean setPairingConfirmation(BluetoothDevice device, boolean accept) { - enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, - "Need BLUETOOTH ADMIN permission"); + enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED, + "Need BLUETOOTH PRIVILEGED permission"); DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device); if (deviceProp == null || deviceProp.getBondState() != BluetoothDevice.BOND_BONDING) { return false; |