commit c7a4002b5f450dbaef2aa36a994d17696485a082
author Zheng Zhang <zhzh@google.com> Wed Dec 14 20:21:18 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 14 20:21:18 2016 +0000
tree 30811616fee5733e5b2a91619f2f170079d56874
parent dd6a667a2cfed7db42b6b5ae657ef390d87e6744
parent 858c3c6391baeda5b15f3cb89d04b94032f755c7

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

Change-Id: I75ab66dba63661dc0b23e980a566d5c204dd414e

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

voice_processing/Android.mk

diff --git a/voice_processing/Android.mk b/voice_processing/Android.mk
index 9b86eaf..73619c6 100644
--- a/voice_processing/Android.mk
+++ b/voice_processing/Android.mk
@@ -14,6 +14,7 @@
     $(call include-path-for, audio-effects)
 
 LOCAL_SHARED_LIBRARIES := \
+    liblog \
     libcutils
 
 LOCAL_SHARED_LIBRARIES += libdl