commit 75b9973693905fe993a387f300a9dce3d09ad459
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Dec 14 20:13:58 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 14 20:13:58 2016 +0000
tree b4367e9e8a45362edcb69a8ebe049fe57a3c9f3d
parent 6185d57e5c101e9bf7f49ab22f33c1f5b102a396
parent 858c3c6391baeda5b15f3cb89d04b94032f755c7

Merge "audio: hal: fix no sound in mic during hfp-sco call" into cw-f-dev

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));