diff options
| author | Eric Laurent <elaurent@google.com> | 2010-12-15 11:48:46 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-15 11:48:46 -0800 |
| commit | 10f0d3f2fcd721e0d5639106f83668b0360bc173 (patch) | |
| tree | fc1ae0f02c6fa7847d045f409cf69d132a4d4124 /services | |
| parent | 00502849dcc54086ad9fabbd90ef3d0e41ae78f5 (diff) | |
| parent | f3a8d32fd475ec68d966fa6f12a4c975ba80b659 (diff) | |
| download | frameworks_av-10f0d3f2fcd721e0d5639106f83668b0360bc173.zip frameworks_av-10f0d3f2fcd721e0d5639106f83668b0360bc173.tar.gz frameworks_av-10f0d3f2fcd721e0d5639106f83668b0360bc173.tar.bz2 | |
Merge "Change audio routing policy for HDMI"
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioPolicyManagerBase.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/services/audioflinger/AudioPolicyManagerBase.cpp b/services/audioflinger/AudioPolicyManagerBase.cpp index 175f613..5b9273d 100644 --- a/services/audioflinger/AudioPolicyManagerBase.cpp +++ b/services/audioflinger/AudioPolicyManagerBase.cpp @@ -1641,19 +1641,19 @@ uint32_t AudioPolicyManagerBase::getDeviceForStrategy(routing_strategy strategy, // FALL THROUGH case STRATEGY_MEDIA: { - uint32_t device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_AUX_DIGITAL; - if (device2 == 0) { - device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_WIRED_HEADPHONE; - } + uint32_t device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_WIRED_HEADPHONE; if (device2 == 0) { device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_WIRED_HEADSET; } if (device2 == 0) { - device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET; + device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_AUX_DIGITAL; } if (device2 == 0) { device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_DGTL_DOCK_HEADSET; } + if (device2 == 0) { + device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET; + } #ifdef WITH_A2DP if (mA2dpOutput != 0) { if (strategy == STRATEGY_SONIFICATION && !a2dpUsedForSonification()) { |