commit d80ed57ee539b1dc62a4c4417fced4ae947a853c
author Vlad Popa <pvlad@google.com> Wed Nov 06 18:28:17 2024 -0800
committer Vlad Popa <pvlad@google.com> Wed Nov 06 18:34:04 2024 -0800
tree 3677192cdd25b951c2e5c9185d551274a8f19c75
parent 97e57ddef0774a5b745d5bf7cfea0a109ab140d7

Fix condition for host managed voice SCO volume

After replacing STREAM_BT_SCO and not using the equivalent volume group
in APM, the flags isVoiceVolSrc and isBtScoVolSrc are not mutual
exclusive anymore. In order to check whether the voice volume is managed
by host it is now necessary to check the isBtScoVolSrc is false.

Test: manual
Flag: EXEMPT bugfix
Bug: 374151894
Change-Id: I3e29b86029cc89b3b78da8da2cbd5e1e31940c42

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 000b571..61b50b4 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -3782,7 +3782,7 @@
         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);
         }
@@ -8588,7 +8588,7 @@
             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);
     }