summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorSimon Wilson <simonwilson@google.com>2011-11-02 17:29:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-02 17:29:32 +0000
commitecd174b5fc23e6f0fa31e2fbaa8ff071c72f5c52 (patch)
tree379fde9b7b3fb35f42c5c5c06d768aaccf36e3b2 /audio
parentd47124e7d9207a99ca4f83fa59cfee0de1c76ba4 (diff)
parentec429c1320e97145b42a8f334ed5506d316bb412 (diff)
downloaddevice_samsung_tuna-ecd174b5fc23e6f0fa31e2fbaa8ff071c72f5c52.zip
device_samsung_tuna-ecd174b5fc23e6f0fa31e2fbaa8ff071c72f5c52.tar.gz
device_samsung_tuna-ecd174b5fc23e6f0fa31e2fbaa8ff071c72f5c52.tar.bz2
am ec429c13: Merge "audio: force speaker route for call when docked" into ics-mr1
* commit 'ec429c1320e97145b42a8f334ed5506d316bb412': audio: force speaker route for call when docked
Diffstat (limited to 'audio')
-rwxr-xr-xaudio/audio_hw.c9
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;
}