diff options
| author | Simon Wilson <simonwilson@google.com> | 2011-10-31 17:31:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-31 17:31:57 -0700 |
| commit | ec429c1320e97145b42a8f334ed5506d316bb412 (patch) | |
| tree | 0bd359bccac8c094dafaf06f05e2fd9c034ccdb7 /audio | |
| parent | 7f791640e769eb6a227de259cccbd6c1bc5d0017 (diff) | |
| parent | 58fc4654a6ec94f15b07e0642aa1cb16d6474a78 (diff) | |
| download | device_samsung_tuna-ec429c1320e97145b42a8f334ed5506d316bb412.zip device_samsung_tuna-ec429c1320e97145b42a8f334ed5506d316bb412.tar.gz device_samsung_tuna-ec429c1320e97145b42a8f334ed5506d316bb412.tar.bz2 | |
Merge "audio: force speaker route for call when docked" into ics-mr1
Diffstat (limited to 'audio')
| -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 2a58f4f..55d221d 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; } |