commit 6b87645430ecf4f322871ada4c9e830f04f16a59
author Eric Laurent <elaurent@google.com> Wed Mar 15 07:29:11 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 15 07:29:11 2023 +0000
tree bbda5a4f4c48c795356ee002bf62a28de08b6dfd
parent 04f11baba51e8e06f0f05f3bd1809ec6aa6f3151
parent f660a51e4b8fdd2ab6c11bbe0b46691356d6c47c

Merge "Set volume for playback over voice call when btsco connected"

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index e736677..9df2cf3 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -7354,7 +7354,8 @@
     // 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