commit 97e8f8f6c7f698eeffd2360b135a1e01eb5b1e60
author qctecmdr <qctecmdr@localhost> Thu Sep 12 04:17:45 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Sep 12 04:17:44 2019 -0700
tree 76324be9694fc204305b250d679c614bc3ab4bae
parent 9809e1c42b8a2270eca2c9c537f9febe2975df53
parent f6e6b960914925c2259ddac7ad5a29eb5450a8cd

Merge "hal: audio-feature-manager: disable all audio feature by default"

hal/audio_extn/audio_extn.c

diff --git a/hal/audio_extn/audio_extn.c b/hal/audio_extn/audio_extn.c
index 9ec1ecb..9057016 100644
--- a/hal/audio_extn/audio_extn.c
+++ b/hal/audio_extn/audio_extn.c
@@ -5789,7 +5789,7 @@
     // default value added is for GSI (non vendor modified images)
     snd_mon_feature_init(
         property_get_bool("vendor.audio.feature.snd_mon.enable",
-                           true));
+                           false));
     compr_cap_feature_init(
         property_get_bool("vendor.audio.feature.compr_cap.enable",
                            false));
@@ -5819,7 +5819,7 @@
                            false));
     usb_offload_feature_init(
         property_get_bool("vendor.audio.feature.usb_offload.enable",
-                           true));
+                           false));
     usb_offload_burst_mode_feature_init(
         property_get_bool("vendor.audio.feature.usb_offload_burst_mode.enable",
                            false));
@@ -5852,25 +5852,25 @@
                            false));
     spkr_prot_feature_init(
         property_get_bool("vendor.audio.feature.spkr_prot.enable",
-                           true));
+                           false));
     fm_feature_init(
         property_get_bool("vendor.audio.feature.fm.enable",
                            false));
     external_qdsp_feature_init(
         property_get_bool("vendor.audio.feature.external_dsp.enable",
-                           true));
+                           false));
     external_speaker_feature_init(
         property_get_bool("vendor.audio.feature.external_speaker.enable",
-                           true));
+                           false));
     external_speaker_tfa_feature_init(
         property_get_bool("vendor.audio.feature.external_speaker_tfa.enable",
                            false));
     hwdep_cal_feature_init(
         property_get_bool("vendor.audio.feature.hwdep_cal.enable",
-                           true));
+                           false));
     hfp_feature_init(
         property_get_bool("vendor.audio.feature.hfp.enable",
-                           true));
+                           false));
     ext_hw_plugin_feature_init(
         property_get_bool("vendor.audio.feature.ext_hw_plugin.enable",
                            false));
@@ -5882,7 +5882,7 @@
                            false));
     concurrent_capture_feature_init(
         property_get_bool("vendor.audio.feature.concurrent_capture.enable",
-                           true));
+                           false));
     compress_in_feature_init(
         property_get_bool("vendor.audio.feature.compress_in.enable",
                            false));
@@ -5891,10 +5891,10 @@
                            false));
     maxx_audio_feature_init(
         property_get_bool("vendor.audio.feature.maxx_audio.enable",
-                           true));
+                           false));
     audiozoom_feature_init(
         property_get_bool("vendor.audio.feature.audiozoom.enable",
-                           true));
+                           false));
     auto_hal_feature_init(
         property_get_bool("vendor.audio.feature.auto_hal.enable",
                            false));

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 17cade6..58c6fd8 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -3192,8 +3192,8 @@
     if (property_get_bool("vendor.audio.ambisonic.auto.profile",false))
         my_data->ambisonic_profile = true;
 
-    if (check_and_get_wsa_info((char *)snd_card_name, &wsaCount, &is_wsa_combo_supported)
-        && audio_extn_is_wsa_enabled()) {
+    if (audio_extn_is_wsa_enabled()
+        && check_and_get_wsa_info((char *)snd_card_name, &wsaCount, &is_wsa_combo_supported)) {
         /*Set ACDB ID of Stereo speaker if two WSAs are present*/
         /*Default ACDB ID for wsa speaker is that for mono*/
         if (wsaCount == 2) {

hal/voice_extn/voice_extn.c

diff --git a/hal/voice_extn/voice_extn.c b/hal/voice_extn/voice_extn.c
index e6a4ed6..0a1a574 100644
--- a/hal/voice_extn/voice_extn.c
+++ b/hal/voice_extn/voice_extn.c
@@ -469,11 +469,10 @@
                           false));
     incall_music_feature_init(
        property_get_bool("vendor.audio.feature.incall_music.enable",
-                          true));
+                          false));
     multi_voice_session_feature_init(
        property_get_bool("vendor.audio.feature.multi_voice_session.enable",
-                          true));
-
+                          false));
 }
 
 void voice_extn_init(struct audio_device *adev)