commit 76d0cc4a3d19e4520b1939f609350305f0489ecb
author android-build-team Robot <android-build-team-robot@google.com> Wed Dec 18 06:24:26 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Dec 18 06:24:26 2019 +0000
tree cc6375eaadcdca2e680ee982875408441841d391
parent f905c68ad5128293048ba6bb2e85d4603f50cc20
parent 0d8307f408f166862fbd6efb593c4d65906a46ae

Merge cherrypicks of [9943992, 9944684, 9944054, 9943993, 9944476, 9942363, 9942364, 9942365, 9942367, 9944685, 9944686, 9943217, 9944762, 9944764, 9944481, 9944411, 9944055, 9944056, 9944057] into qt-qpr1-release

Change-Id: Ie278df2f048025cb36bc28296438b24a5e9f6c72

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 53cf723..2d3d69e 100644
--- a/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/src/com/android/bluetooth/btservice/AdapterService.java
@@ -2314,6 +2314,8 @@
     }
 
     boolean setPhonebookAccessPermission(BluetoothDevice device, int value) {
+        enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED,
+                "Need BLUETOOTH PRIVILEGED permission");
         SharedPreferences pref = getSharedPreferences(PHONEBOOK_ACCESS_PERMISSION_PREFERENCE_FILE,
                 Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = pref.edit();