commit a4c38d6eb431ec2de5f8c918cb951523d22a453c
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 23 16:30:59 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 23 16:30:59 2018 +0000
tree c2347977f5cc5674ee685485842d19348b89bacf
parent 39a4c1fd1b924ae74a32c1c15f21871a78b9e06a
parent a81f098f1fa70a586ecf88478b44760b0d41a148

Merge "The sonification sound is muted during a shutter sound"

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 9d1d468..19df76b 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -1339,6 +1339,11 @@
         }
     }
 
+    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;
 }
 
@@ -1434,6 +1439,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();
         }