diff options
| author | Eric Laurent <elaurent@google.com> | 2010-12-16 09:44:42 -0800 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2010-12-16 09:44:42 -0800 |
| commit | 0b456a6a33de8cb7c641724579382a31a1beaa2c (patch) | |
| tree | b111bee6a8d1c3eb9f2ccf52161d50748cafe96f /services | |
| parent | 10f0d3f2fcd721e0d5639106f83668b0360bc173 (diff) | |
| download | frameworks_av-0b456a6a33de8cb7c641724579382a31a1beaa2c.zip frameworks_av-0b456a6a33de8cb7c641724579382a31a1beaa2c.tar.gz frameworks_av-0b456a6a33de8cb7c641724579382a31a1beaa2c.tar.bz2 | |
Fix speakerphone routing to analog dock
The audio routing policy when speakerphone is on and a dock with built-in
speakers is connected should be to output audio to teh dock speakers
Also removed route to SCO car kit if forced usage is not SCO as the SCO
socket might not be established.
Change-Id: I1aa2954092e28de935304b90f7a7a64d661934c7
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioPolicyManagerBase.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
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 @@ uint32_t AudioPolicyManagerBase::getDeviceForStrategy(routing_strategy strategy, 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 |