commit 41c7badd57278a56dcbd561fb6277d28269df642
author Treehugger Robot <treehugger-gerrit@google.com> Thu Dec 16 10:09:13 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 16 10:09:13 2021 +0000
tree f93647310aa0fac356f7f4351a7db7e405c2151f
parent f527d4325d267515825ae806dcf1199b3363f366
parent 07c654a15a15da2fa58147a0da85bae730ff9dc2

Merge "Select correct device for ENFORCE_AUDIBLE"

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 41f9bed..4ce7851 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -5857,7 +5857,8 @@
             return hasVoiceStream(streams) && (outputDesc == mPrimaryOutput ||
                 outputDesc->isActive(toVolumeSource(AUDIO_STREAM_VOICE_CALL))) &&
                 (isInCall() ||
-                 mOutputs.isStrategyActiveOnSameModule(productStrategy, outputDesc));
+                 mOutputs.isStrategyActiveOnSameModule(productStrategy, outputDesc)) &&
+                !isStreamActive(AUDIO_STREAM_ENFORCED_AUDIBLE, 0);
         };
 
         // With low-latency playing on speaker, music on WFD, when the first low-latency