commit b991fb007d870cbd682273e5fc7413b9d238a6d9
author Eric Laurent <elaurent@google.com> Fri Aug 29 15:23:17 2014 -0500
committer Vineeta Srivastava <vsrivastava@google.com> Fri Aug 29 20:28:15 2014 +0000
tree 017f18b7463160413beffbc8c0225c51b6ab2c8f
parent 3ad4e1b9949d04ad90d053458b10fa4dfbfa088e

hal: fix headset path

Inserting HS without mic should select speakerphone mic
      instead of handset mic

Bug: 17307386
Change-Id: I66d3b9037bbf7da5ff4bfebf2567efa3a0866074

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 4271fa7..492ff9e 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -1286,8 +1286,7 @@
                 goto exit;
             }
         }
-        if (out_device & AUDIO_DEVICE_OUT_EARPIECE ||
-            out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE) {
+        if (out_device & AUDIO_DEVICE_OUT_EARPIECE) {
             if (my_data->fluence_in_voice_call == false) {
                 snd_device = SND_DEVICE_IN_HANDSET_MIC;
                 set_echo_reference(adev, true);
@@ -1305,7 +1304,9 @@
             } else {
                 snd_device = SND_DEVICE_IN_BT_SCO_MIC;
             }
-        } else if (out_device & AUDIO_DEVICE_OUT_SPEAKER) {
+        } else if (out_device & AUDIO_DEVICE_OUT_SPEAKER ||
+            out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE ||
+            out_device & AUDIO_DEVICE_OUT_LINE) {
             if (my_data->fluence_in_voice_call && my_data->fluence_in_spkr_mode &&
                     my_data->dualmic_config != DUALMIC_CONFIG_NONE) {
                 snd_device = SND_DEVICE_IN_VOICE_SPEAKER_DMIC;