commit 84cca0ae89ba23522f12076d08e7dad288571f77
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Aug 10 23:34:39 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 10 23:34:39 2018 +0000
tree b59c87d075f6e2768139fe56c8fbeef1bb6862a3
parent 6d567e1f19dafe010bf115148fed0ec034d5ceb9
parent 5654fa737782fb27f3f79f77e4a4b41b1280e1fa

Merge "audio policy: fix bad auto merge conflict resolution"

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 96079cc..b0e6b0f 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -1514,11 +1514,6 @@
         setStrategyMute(STRATEGY_SONIFICATION, true, outputDesc);
     }
 
-    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;
 }