commit 1b13189bd16a4eab0faa6abb8686e3e9caed4d01
author Zheng Zhang <zhzh@google.com> Wed Dec 14 20:21:19 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 14 20:21:19 2016 +0000
tree 52d2991ec16edc7e2efa793a43650827954174b5
parent 6cf81737bb01e3ab9b5c66e4fc46a1860f56a094
parent 858c3c6391baeda5b15f3cb89d04b94032f755c7

audio: hal: fix no sound in mic during hfp-sco call
am: 858c3c6391

Change-Id: Iba3a04168fc03784e83957e6ec12a4261895efa5

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 914c520..71aecb3 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -3331,7 +3331,7 @@
     if (check_input_parameters(config->sample_rate, config->format, channel_count) != 0)
         return -EINVAL;
 
-    if (audio_extn_tfa_98xx_is_supported() && audio_extn_hfp_is_active(adev))
+    if (audio_extn_tfa_98xx_is_supported() && (audio_extn_hfp_is_active(adev) || voice_is_in_call(adev)))
         return -EINVAL;
 
     in = (struct stream_in *)calloc(1, sizeof(struct stream_in));

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 023a9ef..9d4abec 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -510,6 +510,8 @@
     {TO_NAME_INDEX(USECASE_INCALL_REC_DOWNLINK)},
     {TO_NAME_INDEX(USECASE_INCALL_REC_UPLINK_AND_DOWNLINK)},
     {TO_NAME_INDEX(USECASE_AUDIO_HFP_SCO)},
+    {TO_NAME_INDEX(USECASE_VOICEMMODE1_CALL)},
+    {TO_NAME_INDEX(USECASE_VOICEMMODE2_CALL)},
 };
 
 #define DEEP_BUFFER_PLATFORM_DELAY (29*1000LL)