diff options
| author | Eric Laurent <elaurent@google.com> | 2011-04-26 01:14:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-26 01:14:07 -0700 |
| commit | 5bfdfd1e7b4514c6f6143b6b97ef37013f6e53a9 (patch) | |
| tree | 1f7617ef536b7c1259f480534e17853aff0d6fdc | |
| parent | 7e0c6792de74ff647e3d3ec0eddab3bd57bb761c (diff) | |
| parent | d9046e0a29fb794a7f6fddaa248b814e7b253c42 (diff) | |
| download | frameworks_av-5bfdfd1e7b4514c6f6143b6b97ef37013f6e53a9.zip frameworks_av-5bfdfd1e7b4514c6f6143b6b97ef37013f6e53a9.tar.gz frameworks_av-5bfdfd1e7b4514c6f6143b6b97ef37013f6e53a9.tar.bz2 | |
am 969357e3: am 223995dc: Fix issue 4335692: HDMI media volume
* commit '969357e31c93e168e7a4cb3b41c33a6ec26f4a26':
Fix issue 4335692: HDMI media volume
| -rw-r--r-- | services/audioflinger/AudioPolicyManagerBase.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/services/audioflinger/AudioPolicyManagerBase.cpp b/services/audioflinger/AudioPolicyManagerBase.cpp index f653dc5..f5e7343 100644 --- a/services/audioflinger/AudioPolicyManagerBase.cpp +++ b/services/audioflinger/AudioPolicyManagerBase.cpp @@ -1911,6 +1911,13 @@ float AudioPolicyManagerBase::computeVolume(int stream, int index, audio_io_hand 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 |