commit 0ec391d6b759a649b204b6236c01848e3ade912f
author Eric Laurent <elaurent@google.com> Tue Oct 30 09:55:00 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 30 09:55:00 2012 -0700
tree 6b73b50d39ea0317cf5b2866f7492a2290ada6e2
parent 08139cedcdf37f92c2fe7d8e61be1f4b0f9da9a5
parent 92be42ebb9a62876a003b712ddd2968dde2d6476

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

* commit '92be42ebb9a62876a003b712ddd2968dde2d6476':
  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) {