| commit | bf1627016357e94a1309d81c62dacc1ab3456df6 | [log] [tgz] |
|---|---|---|
| author | android-build-team Robot <android-build-team-robot@google.com> | Sat Dec 14 02:17:51 2019 +0000 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Sat Dec 14 02:17:51 2019 +0000 |
| tree | 91fa8ef51bd9f99a09be1d51d1df54ab4f38140c | |
| parent | a229b78efd48111a7300acce85f16cfa8290eaf2 [diff] | |
| parent | fc62052d3446475a045ee533e0b6dcec1eff8109 [diff] |
Snap for 6072377 from fc62052d3446475a045ee533e0b6dcec1eff8109 to qt-qpr2-release Change-Id: I0d3d17e575a2ae00083ca3a3cb95c978b4d9ad03
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();
diff --git a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java index c5485f9..989043a 100644 --- a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java +++ b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
@@ -841,8 +841,6 @@ break; } case CALL_STATE_CHANGED: { - if (mDeviceSilenced) break; - HeadsetCallState callState = (HeadsetCallState) message.obj; if (!mNativeInterface.phoneStateChange(mDevice, callState)) { stateLogW("processCallState: failed to update call state " + callState);