audio policy: fix enforced audible playback
When selecting device on a given output stream, check if
an enforced audible sound is active on any other output stream and
not just on this stream.
Bug: 124063442
Test: set property audio.camerasound.force=true and test music + shutter
sound concurrency.
Change-Id: Ic7f548df2b67041d532afc68685cdbeb3cb3f125
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index ce305a4..e546e2d 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -5155,7 +5155,7 @@
if ((hasVoiceStream(streams) &&
(isInCall() || mOutputs.isStrategyActiveOnSameModule(productStrategy, outputDesc))) ||
- (hasStream(streams, AUDIO_STREAM_ALARM) &&
+ ((hasStream(streams, AUDIO_STREAM_ALARM) || hasStream(streams, AUDIO_STREAM_ENFORCED_AUDIBLE)) &&
mOutputs.isStrategyActiveOnSameModule(productStrategy, outputDesc)) ||
outputDesc->isStrategyActive(productStrategy)) {
// Retrieval of devices for voice DL is done on primary output profile, cannot