commit 707ab149d7e9a239acaffcab87ebd39d7c39884b
author Linux Build Service Account <lnxbuild@localhost> Mon Nov 28 01:05:38 2016 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Nov 28 01:05:38 2016 -0800
tree edb6b81020f2771d23b2eca1637c4f15b58928fa
parent 0b55ec76b08d0eaf57e5354e00f2a9702cae0e91
parent 6ed1e6376ebbaeb809deb761a08ee9d127151a1c

Merge "hal: Fix incorrect fluence devices selection for VoIP calls" into audio-userspace.lnx.2.1-dev

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 3551006..3abb904 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -3187,7 +3187,8 @@
         if (out_device & AUDIO_DEVICE_OUT_SPEAKER)
             in_device = AUDIO_DEVICE_IN_BACK_MIC;
         if (adev->active_input) {
-            if (adev->active_input->enable_aec &&
+            if (my_data->fluence_type != FLUENCE_NONE &&
+                    adev->active_input->enable_aec &&
                     adev->active_input->enable_ns) {
                 if (in_device & AUDIO_DEVICE_IN_BACK_MIC) {
                     if (my_data->fluence_in_spkr_mode) {
@@ -3213,7 +3214,8 @@
                     snd_device = SND_DEVICE_IN_HEADSET_MIC_FLUENCE;
                 }
                 platform_set_echo_reference(adev, true, out_device);
-            } else if (adev->active_input->enable_aec) {
+            } else if (my_data->fluence_type != FLUENCE_NONE &&
+                       adev->active_input->enable_aec) {
                 if (in_device & AUDIO_DEVICE_IN_BACK_MIC) {
                     if (my_data->fluence_in_spkr_mode) {
                         if ((my_data->fluence_type & FLUENCE_QUAD_MIC) &&
@@ -3238,7 +3240,8 @@
                     snd_device = SND_DEVICE_IN_HEADSET_MIC_FLUENCE;
                 }
                 platform_set_echo_reference(adev, true, out_device);
-            } else if (adev->active_input->enable_ns) {
+            } else if (my_data->fluence_type != FLUENCE_NONE &&
+                       adev->active_input->enable_ns) {
                 if (in_device & AUDIO_DEVICE_IN_BACK_MIC) {
                     if (my_data->fluence_in_spkr_mode) {
                         if ((my_data->fluence_type & FLUENCE_QUAD_MIC) &&