commit 3f9497ead056f004d2cebc3f54d7b041ab16de29
author Ajay Panicker <apanicke@google.com> Thu Sep 08 10:55:51 2016 -0700
committer gitbuildkicker <android-build@google.com> Tue Sep 27 14:53:13 2016 -0700
tree 6d6209e879bc731d3bfa87d2718f206bffa5a4de
parent 9fb2cb5f69d79609d718ee788b8e4cfaa58f887c

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.

Bug: 29043989
Change-Id: Iae8e31b25795989446265fdcc5eb27e6ffaf29aa
(cherry picked from commit df3304a333d8c385f9d5cb0e691fb72d940ec273)

src/com/android/bluetooth/btservice/AdapterService.java

diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java
index 30c35f9..383c0d5 100644
--- a/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/src/com/android/bluetooth/btservice/AdapterService.java
@@ -1991,8 +1991,8 @@
     }
 
      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;