diff options
| author | Simon Wilson <simonwilson@google.com> | 2011-11-02 17:29:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-02 17:29:32 +0000 |
| commit | 56478e1a3e494fe1f3f799ff87762caa063a7647 (patch) | |
| tree | d84b373ca551bc6ca910580699280069ff875221 /audio/audio_hw.c | |
| parent | db9b4e650ba60cb335c148d54c42d2ac98880220 (diff) | |
| parent | 8e4929d7f9501e499853bd51ad0ce7cc8b586906 (diff) | |
| download | device_samsung_tuna-56478e1a3e494fe1f3f799ff87762caa063a7647.zip device_samsung_tuna-56478e1a3e494fe1f3f799ff87762caa063a7647.tar.gz device_samsung_tuna-56478e1a3e494fe1f3f799ff87762caa063a7647.tar.bz2 | |
am ec429c13: Merge "audio: force speaker route for call when docked" into ics-mr1
* commit '8e4929d7f9501e499853bd51ad0ce7cc8b586906':
audio: force speaker route for call when docked
Diffstat (limited to 'audio/audio_hw.c')
| -rwxr-xr-x | audio/audio_hw.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 079acd7..8eb347a 100755 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -697,6 +697,7 @@ static void set_incall_device(struct tuna_audio_device *adev) break; case AUDIO_DEVICE_OUT_SPEAKER: case AUDIO_DEVICE_OUT_AUX_DIGITAL: + case AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET: device_type = SOUND_AUDIO_PATH_SPEAKER; break; case AUDIO_DEVICE_OUT_WIRED_HEADSET: @@ -951,9 +952,11 @@ static void select_output_device(struct tuna_audio_device *adev) break; case TTY_MODE_OFF: default: - /* force speaker on when in call and HDMI is selected as voice DL audio - * cannot be routed to HDMI by ABE */ - if (adev->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL) + /* force speaker on when in call and HDMI or S/PDIF is selected + * as voice DL audio cannot be routed there by ABE */ + if (adev->devices & + (AUDIO_DEVICE_OUT_AUX_DIGITAL | + AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET)) speaker_on = 1; break; } |