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

Commit e8f2c0fa authored by Eric Laurent's avatar Eric Laurent
Browse files

audio policy: fix call volume upon speaker to USB transition 

Fix voice volume handling in checkAndSetVolume() to only update
voice volume when changing volume on the primary output.
By convention, call routing and volume is managed by the primary output
and as other outputs may use a different device than the device selected
for calls, a wrong voice volume can be computed and overwrite a correct
volume set previously.

Bug: 195907034
Test: repro steps in the bug
Change-Id: Iafecb4df159db84addc3d802cdd2775cc696e07e
parent f72b417e

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -6548,7 +6548,7 @@ status_t AudioPolicyManager::checkAndSetVolume(IVolumeCurves &curves, 
    outputDesc->setVolume(

            volumeDb, volumeSource, curves.getStreamTypes(), deviceTypes, delayMs, force);



    if (isVoiceVolSrc || isBtScoVolSrc) {

    if (outputDesc == mPrimaryOutput && (isVoiceVolSrc || isBtScoVolSrc)) {

        float voiceVolume;

        // Force voice volume to max or mute for Bluetooth SCO as other attenuations are managed by the headset

        if (isVoiceVolSrc) {