commit 9ef1bd649de7ae64047de29c389fb8a1a9b1dd71
author Eric Laurent <elaurent@google.com> Sat Aug 30 00:53:57 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Aug 30 00:53:57 2014 +0000
tree 84b435016b39a48f9fcbd0c58269d7599dd7b4cf
parent b991fb007d870cbd682273e5fc7413b9d238a6d9
parent 99c752d87eb818fc3cfb2e5c6790b1ea0bc88da5

Merge "Revert "Revert "audio: add support for routing to/from voice TX/RX paths""" into lmp-dev

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 1a10850..fe937d5 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -1302,8 +1302,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);
@@ -1321,7 +1320,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;