commit b62d78b72d9e63b93d869c9c8513f46235f83e03
author Tomoharu Kasahara <tomoharu.kasahara@sony.com> Thu Jan 18 20:55:02 2018 +0900
committer Jean-Michel Trivi <jmtrivi@google.com> Tue Mar 20 10:45:53 2018 -0700
tree 1274802d638242980024faf541c52748672cbbc8
parent 337272811a792a9a6b2eac4e3796d365f80cd0d2

The sonification sound is muted during a shutter sound

In order to fulfill requirements from some operators the
shutter sound must be heard clearly when playing a ringtone.
The new policy is that STRATEGY_SONIFICATION will be muted
on an output if FORCE_SYSTEM_ENFORCED is set.

Bug: 72295489
Test: Check if ringtone is muted when playing shutter sound.
Change-Id: I10a9ee91eed747fa526260738636b7506bc1f7a5

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 74ca902..73d92ac 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -1266,6 +1266,11 @@
         // We do not introduce additional delay here.
     }
 
+    if (stream == AUDIO_STREAM_ENFORCED_AUDIBLE &&
+            mEngine->getForceUse(AUDIO_POLICY_FORCE_FOR_SYSTEM) == AUDIO_POLICY_FORCE_SYSTEM_ENFORCED) {
+        setStrategyMute(STRATEGY_SONIFICATION, true, outputDesc);
+    }
+
     return NO_ERROR;
 }
 
@@ -1366,6 +1371,12 @@
             // update the outputs if stopping one with a stream that can affect notification routing
             handleNotificationRoutingForStream(stream);
         }
+
+        if (stream == AUDIO_STREAM_ENFORCED_AUDIBLE &&
+                mEngine->getForceUse(AUDIO_POLICY_FORCE_FOR_SYSTEM) == AUDIO_POLICY_FORCE_SYSTEM_ENFORCED) {
+            setStrategyMute(STRATEGY_SONIFICATION, false, outputDesc);
+        }
+
         if (stream == AUDIO_STREAM_MUSIC) {
             selectOutputForMusicEffects();
         }