From bb760036a166bd75f7a48e6d18880a7364dd61af Mon Sep 17 00:00:00 2001 From: Ajay Panicker Date: Thu, 8 Sep 2016 10:55:51 -0700 Subject: Fix setPairingConfirmation permissions issue (1/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. CYNGNOS-3303 Bug: 29043989 Change-Id: Iae8e31b25795989446265fdcc5eb27e6ffaf29aa (cherry picked from commit 554f13336ef3e9b96f7e912c562935903bc6be75) (cherry picked from commit e7095a79e346d99036386c09063a288660cf6ba3) --- src/com/android/bluetooth/btservice/AdapterService.java | 4 ++-- 1 file 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; -- cgit v1.2.3