From 5a484b753cc72d6a50c1dd3bbf68b3403c741a3a Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Fri, 26 Oct 2012 18:04:03 -0700 Subject: audio policy: active analog dock force usage Qualify the selection of the analog dock for media by the force use. Bug 7302106. Change-Id: I2ea48fd43866ce8491085bba72a27751b2203401 --- audio/AudioPolicyManagerBase.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp index 35dd219..b4f4778 100644 --- a/audio/AudioPolicyManagerBase.cpp +++ b/audio/AudioPolicyManagerBase.cpp @@ -2240,7 +2240,8 @@ audio_devices_t AudioPolicyManagerBase::getDeviceForStrategy(routing_strategy st // no sonification on aux digital (e.g. HDMI) 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; } if (device2 == AUDIO_DEVICE_NONE) { -- cgit v1.1