commit 49bcbaed50918071ec9508acdb6c1ea398e64751
author Eric Laurent <elaurent@google.com> Thu Dec 16 10:41:16 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 16 10:41:16 2010 -0800
tree ca3b03c482c4ec3ebdf6a6de15a4f7611a1412b0
parent f4a0e014f53c131dbb9ae86921b8064993c09e61
parent 0b456a6a33de8cb7c641724579382a31a1beaa2c

Merge "Fix speakerphone routing to analog dock"

services/audioflinger/AudioPolicyManagerBase.cpp

diff --git a/services/audioflinger/AudioPolicyManagerBase.cpp b/services/audioflinger/AudioPolicyManagerBase.cpp
index 5b9273d..855af9f 100644
--- a/services/audioflinger/AudioPolicyManagerBase.cpp
+++ b/services/audioflinger/AudioPolicyManagerBase.cpp
@@ -1605,10 +1605,8 @@
             break;
 
         case AudioSystem::FORCE_SPEAKER:
-            if (!isInCall() || strategy != STRATEGY_DTMF) {
-                device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_BLUETOOTH_SCO_CARKIT;
-                if (device) break;
-            }
+            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET;
+            if (device) break;
 #ifdef WITH_A2DP
             // when not in a phone call, phone strategy should route STREAM_VOICE_CALL to
             // A2DP speaker when forcing to speaker output