commit 5a484b753cc72d6a50c1dd3bbf68b3403c741a3a
author Eric Laurent <elaurent@google.com> Fri Oct 26 18:04:03 2012 -0700
committer Eric Laurent <elaurent@google.com> Fri Oct 26 18:04:03 2012 -0700
tree 6b73b50d39ea0317cf5b2866f7492a2290ada6e2
parent 06eda4e2d5cb8aff7253e6be111553086fbc9b82

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

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 @@
             // 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) {