commit ba608ab23519465b707f8a7e79ac40283d33bb48
author android-build-team Robot <android-build-team-robot@google.com> Sun Jan 14 08:46:06 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Jan 14 08:46:06 2018 +0000
tree 1feecba973db5bfe89cdcc680029f08edb5540d7
parent 25ee60a808212d22091b3be245c9f539878fedc5
parent 46c68d35a7566dee0ea169998ffe9452043adc24

Snap for 4545621 from 46c68d35a7566dee0ea169998ffe9452043adc24 to pi-release

Change-Id: I80e23c7880b00f7d598b2da9cd75f096d2fa2242

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 2fbfc3d..47d7a0e 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -3420,7 +3420,9 @@
      * to always provide zeroes when muted.
      * No need to acquire adev->lock to read mic_muted here as we don't change its state.
      */
-    if (ret == 0 && adev->mic_muted && in->usecase != USECASE_AUDIO_RECORD_AFE_PROXY) {
+    if (ret == 0 && adev->mic_muted &&
+        !voice_is_in_call_rec_stream(in) &&
+        in->usecase != USECASE_AUDIO_RECORD_AFE_PROXY) {
         memset(buffer, 0, bytes);
         in->frames_muted += frames;
     }

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 4addc80..3698a85 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -1369,7 +1369,7 @@
         dual_mic_config = true;
     }
 
-    my_data->source_mic_type = SOURCE_DUAL_MIC;
+    my_data->source_mic_type = 0;
 
     my_data->fluence_in_spkr_mode = false;
     my_data->fluence_in_voice_call = false;