Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '969357e31c93e168e7a4cb3b41c33a6ec26f4a26':
  Fix issue 4335692: HDMI media volume
This commit is contained in:
Eric Laurent
2011-04-26 01:14:07 -07:00
committed by Android Git Automerger
parent 759efacd2d 969357e31c
commit 48dca4de70
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/audioflinger/AudioPolicyManagerBase.cpp
View File

@@ -1911,6 +1911,13 @@ float AudioPolicyManagerBase::computeVolume(int stream, int index, audio_io_hand
device = outputDesc->device(); 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); volume = volIndexToAmpl(device, streamDesc, index);
// if a headset is connected, apply the following rules to ring tones and notifications // if a headset is connected, apply the following rules to ring tones and notifications