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

Commit bdb1d9e4 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cherrypicker-L43200000958217546:N96600001329327837"... 

Merge changes from topic "cherrypicker-L43200000958217546:N96600001329327837" into tm-qpr-dev am: 459e4c32

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21028542



Change-Id: I8d46bb944fd37eaf0e759bb7215e7ce1bf7ea804
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 586de13f 459e4c32

android/app/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java

+5 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import android.os.Looper; 
import android.os.Message;

import android.os.ParcelUuid;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.util.Log;

import android.util.Pair;
@@ -1552,8 +1553,11 @@ public class HeadsetClientStateMachine extends StateMachine { 
                            if (event.valueInt == HeadsetClientHalConstants.VOLUME_TYPE_SPK) {

                                mCommandedSpeakerVolume = hfToAmVol(event.valueInt2);

                                logD("AM volume set to " + mCommandedSpeakerVolume);

                                boolean show_volume = SystemProperties

                                        .getBoolean("bluetooth.hfp_volume_control.enabled", true);

                                mAudioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL,

                                        +mCommandedSpeakerVolume, AudioManager.FLAG_SHOW_UI);

                                        +mCommandedSpeakerVolume,

                                        show_volume ? AudioManager.FLAG_SHOW_UI : 0);

                            } else if (event.valueInt

                                    == HeadsetClientHalConstants.VOLUME_TYPE_MIC) {

                                mAudioManager.setMicrophoneMute(event.valueInt2 == 0);