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

Commit 82fa9d0a authored by Vlad Popa's avatar Vlad Popa Committed by Android (Google) Code Review
Browse files

Merge "Fix condition for host managed voice SCO volume" into main

parents 170ac741 d80ed57e

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -3791,7 +3791,7 @@ status_t AudioPolicyManager::setVolumeIndexForAttributes(const audio_attributes_ 
        if (isVolumeConsistentForCalls(vs, {mCallRxSourceClient->sinkDevice()->type()},

                isVoiceVolSrc, isBtScoVolSrc, __func__)

                && (isVoiceVolSrc || isBtScoVolSrc)) {

            bool voiceVolumeManagedByHost = isVoiceVolSrc &&

            bool voiceVolumeManagedByHost = !isBtScoVolSrc &&

                    !audio_is_ble_out_device(mCallRxSourceClient->sinkDevice()->type());

            setVoiceVolume(index, curves, voiceVolumeManagedByHost, 0);

        }
@@ -8597,7 +8597,7 @@ status_t AudioPolicyManager::checkAndSetVolume(IVolumeCurves &curves, 
            deviceTypes, delayMs, force, isVoiceVolSrc);



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

        bool voiceVolumeManagedByHost = isVoiceVolSrc &&

        bool voiceVolumeManagedByHost = !isBtScoVolSrc &&

                !isSingleDeviceType(deviceTypes, audio_is_ble_out_device);

        setVoiceVolume(index, curves, voiceVolumeManagedByHost, delayMs);

    }