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

Commit f95bdcbb 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:... 

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

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



Change-Id: Ib90e2cf8538468026032fefcfefe258f42d80cfa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 456d4375 fee7cb46

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+2 −1
Original line number Diff line number Diff line
@@ -7712,7 +7712,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