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 | 48dca4de70890d324b5830a58bb9fa273164151a (patch) | |
| tree | 8358b7370aaf5ea0f4fd20f153d755886b092315 | |
| parent | 759efacd2d1cf70d10f66fb9656de656ac8ca867 (diff) | |
| parent | 969357e31c93e168e7a4cb3b41c33a6ec26f4a26 (diff) | |
| download | frameworks_base-48dca4de70890d324b5830a58bb9fa273164151a.zip frameworks_base-48dca4de70890d324b5830a58bb9fa273164151a.tar.gz frameworks_base-48dca4de70890d324b5830a58bb9fa273164151a.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 |