commit e7b213496831aa324373a5a4370d50a7ba62e3f7
author Vikram Panduranga <vpandura@codeaurora.org> Mon Jun 05 15:57:23 2017 -0700
committer Shiv Maliyappanahalli <smaliyap@codeaurora.org> Tue Jul 11 15:02:25 2017 -0700
tree 93418a08ff5a768bcfda41cf8766b46a17aff218
parent d770a36343dd0933cf9e44b47051049b99e81020

audio: hal: Fix handset mic selection for voice call

A bug was introduced when HFP call support was added previously.
Due to this handset call would always pick single mic even when
Fluence property was enabled. This fix addresses the issue.

Change-Id: I577d64b28bedde925b90417930533ba6dea60793

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index eba8e97..b3f95bf 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -3948,8 +3948,8 @@
                 snd_device = SND_DEVICE_IN_AANC_HANDSET_MIC;
                 adev->acdb_settings |= ANC_FLAG;
             } else if (my_data->fluence_type == FLUENCE_NONE ||
-                my_data->fluence_in_voice_call == false ||
-                my_data->fluence_in_hfp_call == false) {
+                (my_data->fluence_in_voice_call == false &&
+                 my_data->fluence_in_hfp_call == false)) {
                 snd_device = SND_DEVICE_IN_HANDSET_MIC;
                 if (audio_extn_hfp_is_active(adev))
                     platform_set_echo_reference(adev, true, out_device);

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index cb70875..9073e70 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -3712,8 +3712,8 @@
                 }
                 adev->acdb_settings |= ANC_FLAG;
             } else if (my_data->fluence_type == FLUENCE_NONE ||
-                my_data->fluence_in_voice_call == false ||
-                my_data->fluence_in_hfp_call == false) {
+                (my_data->fluence_in_voice_call == false &&
+                 my_data->fluence_in_hfp_call == false)) {
                 snd_device = SND_DEVICE_IN_HANDSET_MIC;
                 if (audio_extn_hfp_is_active(adev))
                     platform_set_echo_reference(adev, true, out_device);