am 223995dc: Fix issue 4335692: HDMI media volume

* commit '223995dcf28aca2399258951a59559a7ae318ceb':
  Fix issue 4335692: HDMI media volume
This commit is contained in:
Eric Laurent
2011-04-26 00:19:34 -07:00
committed by Android Git Automerger

View File

@@ -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