commit 0f3303804d387c9e81ec90967c4c4eaafd07132b
author Yamit Mehta <ymehta@codeaurora.org> Wed Aug 17 12:45:49 2016 +0530
committer Alain Vongsouvanh <alainv@google.com> Fri Aug 19 08:25:52 2016 -0700
tree aa0c45be0a77c986901062493d6c148277fa22ea
parent ede5c4909922feb66633478f59d0b6f850d69143

DO NOT MERGE ANYWHERE audio: hal: Update Tx mute calling in HFP call.

Apply TX mute in HFP call based on MODE_IN_CALL.

BUG: 30912161

Change-Id: I594fba5f160a8c164e2f22ade8ea60a2d12c8f3b

msm8909/hal/audio_extn/hfp.c

diff --git a/msm8909/hal/audio_extn/hfp.c b/msm8909/hal/audio_extn/hfp.c
index e27ec98..2cd26c9 100644
--- a/msm8909/hal/audio_extn/hfp.c
+++ b/msm8909/hal/audio_extn/hfp.c
@@ -310,7 +310,7 @@
 
     ALOGI("%s: enter, state=%d", __func__, state);
 
-    if (adev->mode == AUDIO_MODE_IN_COMMUNICATION) {
+    if (adev->mode == AUDIO_MODE_IN_CALL) {
         set_values[0] = state;
         ctl = mixer_get_ctl_by_name(adev->mixer, mixer_ctl_name);
         if (!ctl) {

msm8909/hal/voice.c

diff --git a/msm8909/hal/voice.c b/msm8909/hal/voice.c
index 7f59980..fd4d5b8 100644
--- a/msm8909/hal/voice.c
+++ b/msm8909/hal/voice.c
@@ -329,10 +329,10 @@
     int err = 0;
 
     adev->voice.mic_mute = state;
-    if (adev->mode == AUDIO_MODE_IN_CALL)
-        err = platform_set_mic_mute(adev->platform, state);
-    if (adev->mode == AUDIO_MODE_IN_COMMUNICATION && audio_extn_hfp_is_active(adev)) {
+    if (adev->mode == AUDIO_MODE_IN_CALL && audio_extn_hfp_is_active(adev)) {
         err = hfp_set_mic_mute(adev, state);
+    } else if (adev->mode == AUDIO_MODE_IN_CALL) {
+        err = platform_set_mic_mute(adev->platform, state);
     } else if (adev->mode == AUDIO_MODE_IN_COMMUNICATION) {
         err = voice_extn_compress_voip_set_mic_mute(adev, state);
     }