commit dab0bea38ab2c2d6b52907b7f5684834c4979251
author Eric Laurent <elaurent@google.com> Tue Apr 26 12:44:53 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 26 12:44:53 2011 -0700
tree 19d78d36cb01510a67345467f1c6bc81f6d7f03d
parent 2e40530f7cbb024b60c491f42dadb2597d4de07e
parent 5bfdfd1e7b4514c6f6143b6b97ef37013f6e53a9

am 48dca4de: am 969357e3: am 223995dc: Fix issue 4335692: HDMI media volume

* commit '48dca4de70890d324b5830a58bb9fa273164151a':
  Fix issue 4335692: HDMI media volume

services/audioflinger/AudioPolicyManagerBase.cpp

diff --git a/services/audioflinger/AudioPolicyManagerBase.cpp b/services/audioflinger/AudioPolicyManagerBase.cpp
index c0ac669..32d92dc 100644
--- a/services/audioflinger/AudioPolicyManagerBase.cpp
+++ b/services/audioflinger/AudioPolicyManagerBase.cpp
@@ -1911,6 +1911,13 @@
         device = outputDesc->device();
     }
 
+    // if volume is not 0 (not muted), force media volume to max on digital output
+    if (stream == AudioSystem::MUSIC &&
+        index != mStreams[stream].mIndexMin &&
+        device == AudioSystem::DEVICE_OUT_AUX_DIGITAL) {
+        return 1.0;
+    }
+
     volume = volIndexToAmpl(device, streamDesc, index);
 
     // if a headset is connected, apply the following rules to ring tones and notifications