tequilaOS/platform_hardware_libhardware_legacy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 92be42eb: am 5a484b75: audio policy: active analog dock force usage

Browse source 
* commit '92be42ebb9a62876a003b712ddd2968dde2d6476':
  audio policy: active analog dock force usage
This commit is contained in:
Eric Laurent 2012-10-30 09:55:00 -07:00 committed by Android Git Automerger
commit 0ec391d6b7
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
audio/AudioPolicyManagerBase.cpp
View file

@ -2240,7 +2240,8 @@ audio_devices_t AudioPolicyManagerBase::getDeviceForStrategy(routing_strategy st
// no sonification on aux digital (e.g. HDMI) // no sonification on aux digital (e.g. HDMI)
device2 = mAvailableOutputDevices & AUDIO_DEVICE_OUT_AUX_DIGITAL; device2 = mAvailableOutputDevices & AUDIO_DEVICE_OUT_AUX_DIGITAL;
} }
if (device2 == AUDIO_DEVICE_NONE) { if ((device2 == AUDIO_DEVICE_NONE) &&
(mForceUse[AudioSystem::FOR_DOCK] == AudioSystem::FORCE_ANALOG_DOCK)) {
device2 = mAvailableOutputDevices & AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET; device2 = mAvailableOutputDevices & AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET;
} }
if (device2 == AUDIO_DEVICE_NONE) { if (device2 == AUDIO_DEVICE_NONE) {