Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf162701 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6072377 from fc62052d to qt-qpr2-release 

Change-Id: I0d3d17e575a2ae00083ca3a3cb95c978b4d9ad03
parents a229b78e fc62052d

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

+2 −0
Original line number Diff line number Diff line
@@ -2314,6 +2314,8 @@ public class AdapterService extends Service { 
    }



    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();

src/com/android/bluetooth/hfp/HeadsetStateMachine.java

+0 −2
Original line number Diff line number Diff line
@@ -841,8 +841,6 @@ public class HeadsetStateMachine extends StateMachine { 
                    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);