commit 382bbc8fd1617e96881693c5f747def476c5786f
author Jean-Michel Trivi <jmtrivi@google.com> Mon Nov 28 22:24:36 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 28 22:24:37 2016 +0000
tree 129bba96367e1a89af182ba4cf847ed8d5678897
parent a447a0f52fff7f1cab3bbe7c0a2f9b96f8e3914e
parent 99bb2f9afd956174785051827aa96d008b33faee

Merge "Do not hardcode media - a11y stream aliasing"

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 5ef0216..a714041 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -4477,9 +4477,7 @@
 
 bool AudioPolicyManager::streamsMatchForvolume(audio_stream_type_t stream1,
                                                audio_stream_type_t stream2) {
-    return ((stream1 == stream2) ||
-            ((stream1 == AUDIO_STREAM_ACCESSIBILITY) && (stream2 == AUDIO_STREAM_MUSIC)) ||
-            ((stream1 == AUDIO_STREAM_MUSIC) && (stream2 == AUDIO_STREAM_ACCESSIBILITY)));
+    return (stream1 == stream2);
 }
 
 uint32_t AudioPolicyManager::getStrategyForStream(audio_stream_type_t stream) {