diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-11-08 15:13:02 -0800 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-11-09 11:59:09 -0800 |
| commit | 6213dabc977021f60f0e5fc90c07e91269cf8d59 (patch) | |
| tree | f2a5b15aaf5a4dd01fe9f9d821c742a43515bc9c | |
| parent | 0df71000e9edb685f6be00401f88d02cbb509cf2 (diff) | |
| parent | 0665d10ab564a373ee235b90af96f589dc455068 (diff) | |
| download | android_packages_apps_Bluetooth-6213dabc977021f60f0e5fc90c07e91269cf8d59.tar.gz android_packages_apps_Bluetooth-6213dabc977021f60f0e5fc90c07e91269cf8d59.tar.bz2 android_packages_apps_Bluetooth-6213dabc977021f60f0e5fc90c07e91269cf8d59.zip | |
Merge tag 'android-6.0.1_r74' into HEAD
CYNGNOS-3303
Android 6.0.1 release 74
Change-Id: I0300b0fe91395d76ab3da579bc442e15d6ca0094
| -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 86b3cecac..e95577dcb 100644 --- a/src/com/android/bluetooth/btservice/AdapterService.java +++ b/src/com/android/bluetooth/btservice/AdapterService.java @@ -2103,8 +2103,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; |