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

Commit b8086daf authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "Set volume for playback over voice call when btsco connected" am: 6b876454 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2486720



Change-Id: Iece81fbc2b9d8db89972cec80595dee51ad19e52
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 24985340 6b876454

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+2 −1
Original line number Diff line number Diff line
@@ -7354,7 +7354,8 @@ status_t AudioPolicyManager::checkAndSetVolume(IVolumeCurves &curves, 
    // if sco and call follow same curves, bypass forceUseForComm

    if ((callVolSrc != btScoVolSrc) &&

            ((isVoiceVolSrc && isScoRequested) ||

             (isBtScoVolSrc && !(isScoRequested || isHAUsed)))) {

             (isBtScoVolSrc && !(isScoRequested || isHAUsed))) &&

            !isSingleDeviceType(deviceTypes, AUDIO_DEVICE_OUT_TELEPHONY_TX)) {

        ALOGV("%s cannot set volume group %d volume when is%srequested for comm", __func__,

             volumeSource, isScoRequested ? " " : " not ");

        // Do not return an error here as AudioService will always set both voice call