commit 92be42ebb9a62876a003b712ddd2968dde2d6476
author Eric Laurent <elaurent@google.com> Mon Oct 29 14:32:05 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 29 14:32:05 2012 -0700
tree 6b73b50d39ea0317cf5b2866f7492a2290ada6e2
parent 6d4af736d09fcc7165d3e36bc86b7292d76ad1a4
parent 5a484b753cc72d6a50c1dd3bbf68b3403c741a3a

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

* commit '5a484b753cc72d6a50c1dd3bbf68b3403c741a3a':
  audio policy: active analog dock force usage

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