summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Mertz <scott@cyngn.com>2015-10-05 00:37:46 -0500
committerRashed Abdel-Tawab <rashed@linux.com>2015-10-09 18:28:57 -0400
commit72d800892c769194750190c1eed1014613b07623 (patch)
tree008b5e20fe978c1eae4e7521fc9884f80ec4cf3e
parent2778920c4c23d5a2f05c3772cee503a167342544 (diff)
downloadhardware_qcom_audio-72d800892c769194750190c1eed1014613b07623.tar.gz
hardware_qcom_audio-72d800892c769194750190c1eed1014613b07623.tar.bz2
hardware_qcom_audio-72d800892c769194750190c1eed1014613b07623.zip
Revert "hal: Use speakerphone mics for wired headphones"
This reverts commit ebf834f8d8aa6dd5f1e496ee410eefd5bbfb27e1. SAMBAR-732 Change-Id: I21f453ee54eea0eaca17ffd66f07c535ce13f214
-rw-r--r--hal/msm8974/platform.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 3221a0a9..00e4f602 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -1980,7 +1980,8 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d
goto exit;
}
}
- if (out_device & AUDIO_DEVICE_OUT_EARPIECE) {
+ if (out_device & AUDIO_DEVICE_OUT_EARPIECE ||
+ out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE) {
if (out_device & AUDIO_DEVICE_OUT_EARPIECE &&
audio_extn_should_use_handset_anc(channel_count)) {
snd_device = SND_DEVICE_IN_AANC_HANDSET_MIC;
@@ -2009,8 +2010,7 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d
else
snd_device = SND_DEVICE_IN_BT_SCO_MIC;
}
- } else if (out_device & AUDIO_DEVICE_OUT_SPEAKER ||
- out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE) {
+ } else if (out_device & AUDIO_DEVICE_OUT_SPEAKER) {
if (my_data->fluence_type != FLUENCE_NONE &&
my_data->fluence_in_voice_call &&
my_data->fluence_in_spkr_mode) {