commit 6fce6f0a63935630a45218298865b27cac1588c1
author Zheng Zhang <zhzh@google.com> Wed Dec 14 20:34:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 14 20:34:46 2016 +0000
tree 5982735556066ec063471ff15accfde1a78a003b
parent 2dbeb616a1d722d8d097e3fd63edb46fd741c126
parent 98b42e55c3f3b27f1f7b7e9ad31f839889f7475a

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

Change-Id: Id0b19a5a8217791e08f0442eec87adf10c451f35

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 14809a9..f7953cc 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -31,6 +31,7 @@
 #include "audio_extn.h"
 #include "voice_extn.h"
 #include "sound/msmcal-hwdep.h"
+#include "audio_extn/tfa_98xx.h"
 #include <dirent.h>
 #define MAX_MIXER_XML_PATH  100
 #define MIXER_XML_PATH "/system/etc/mixer_paths.xml"
@@ -1304,13 +1305,17 @@
     else
         acdb_dev_type = ACDB_DEV_TYPE_IN;
 
-    if ((my_data->acdb_send_audio_cal_v3) && (snd_device == SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP)) {
+    if ((my_data->acdb_send_audio_cal_v3) &&
+        (snd_device == SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP) &&
+        !audio_extn_tfa_98xx_is_supported() ) {
             /* TX path calibration */
             my_data->acdb_send_audio_cal_v3(acdb_dev_id, ACDB_DEV_TYPE_IN,
                                 DEFAULT_APP_TYPE_TX_PATH, sample_rate, BUFF_IDX_0);
             my_data->acdb_send_audio_cal_v3(acdb_dev_id, ACDB_DEV_TYPE_OUT,
                                 DEFAULT_APP_TYPE_RX_PATH, sample_rate, BUFF_IDX_0);
-    } else if ((my_data->acdb_send_audio_cal_v3) && (snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_HFP)) {
+    } else if ((my_data->acdb_send_audio_cal_v3) &&
+               (snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_HFP) &&
+               !audio_extn_tfa_98xx_is_supported()) {
             /* RX path calibration */
             ALOGV("%s: sending audio calibration for snd_device(%d) acdb_id(%d)",
                        __func__, snd_device, acdb_dev_id);