commit 982ecd07f4da2f93704aa84a3b4f61fa79466b8b
author Eric Laurent <elaurent@google.com> Tue Jan 07 18:22:05 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 07 18:22:05 2020 +0000
tree a20da4ece33116d2264b8a78666818facef722e4
parent 7f4beda2de35f9948017a6fe44e7e5cf54c99fb7
parent 019c1737ed05c4bff220cd8bc1de5a9991647422

Merge "Select correct devices when ENFORCED_AUDIBLE is set"

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 8085fd5..b427794 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -5291,7 +5291,8 @@
         auto attr = mEngine->getAllAttributesForProductStrategy(productStrategy).front();
 
         if ((hasVoiceStream(streams) &&
-             (isInCall() || mOutputs.isStrategyActiveOnSameModule(productStrategy, outputDesc))) ||
+             (isInCall() || mOutputs.isStrategyActiveOnSameModule(productStrategy, outputDesc)) &&
+             !isStreamActive(AUDIO_STREAM_ENFORCED_AUDIBLE, 0)) ||
              ((hasStream(streams, AUDIO_STREAM_ALARM) || hasStream(streams, AUDIO_STREAM_ENFORCED_AUDIBLE)) &&
                 mOutputs.isStrategyActiveOnSameModule(productStrategy, outputDesc)) ||
                 outputDesc->isStrategyActive(productStrategy)) {