commit 1dfd6dc8c420632e4cdb69594614f549927093ef
author gitbuildkicker <android-build@google.com> Fri Dec 02 18:06:36 2016 -0800
committer gitbuildkicker <android-build@google.com> Fri Dec 02 18:06:36 2016 -0800
tree 6d6209e879bc731d3bfa87d2718f206bffa5a4de
parent e1b6db10e913c09d0b695368336137f6aabee462
parent b7d7b454eabea63d43977f3baf76cb55bb3dd7a0

merge in nougat-cts-release history after reset to nougat-cts-dev

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;