commit 615c2d3a7d54cbc70554b5482756915d5a1b00ac
author qctecmdr <qctecmdr@localhost> Mon Sep 23 22:54:23 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Sep 23 22:54:23 2019 -0700
tree 5816cd467983e0572817fde4f32a2336467eb108
parent 74081f6f6a2d8ce3101362ea5ed3375be7955ee0
parent e07c1b69ecd4ddf9ceb79e4e5dd65c1190ff31e9

Merge "configs: Disable ambisonics capture by default on Kona"

configs/kona/kona.mk

diff --git a/configs/kona/kona.mk b/configs/kona/kona.mk
index 16ef488..6b73f5d 100644
--- a/configs/kona/kona.mk
+++ b/configs/kona/kona.mk
@@ -216,11 +216,11 @@
 
 ##Ambisonic Capture
 PRODUCT_PROPERTY_OVERRIDES += \
-vendor.audio.ambisonic.capture=true \
-vendor.audio.ambisonic.auto.profile=true
+persist.vendor.audio.ambisonic.capture=false \
+persist.vendor.audio.ambisonic.auto.profile=false
 
 PRODUCT_PROPERTY_OVERRIDES += \
-vendor.audio.apptype.multirec.enabled=true
+persist.vendor.audio.apptype.multirec.enabled=false
 
 ##fluencetype can be "fluence" or "fluencepro" or "none"
 PRODUCT_PROPERTY_OVERRIDES += \

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 931ac90..8d6e7bc 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -3185,11 +3185,11 @@
         }
     }
     /* Check for Ambisonic Capture Enablement */
-    if (property_get_bool("vendor.audio.ambisonic.capture",false))
+    if (property_get_bool("persist.vendor.audio.ambisonic.capture",false))
         my_data->ambisonic_capture = true;
 
     /* Check for Ambisonic Profile Assignment*/
-    if (property_get_bool("vendor.audio.ambisonic.auto.profile",false))
+    if (property_get_bool("persist.vendor.audio.ambisonic.auto.profile",false))
         my_data->ambisonic_profile = true;
 
     if (audio_extn_is_wsa_enabled()
@@ -3761,7 +3761,7 @@
         }
     }
 
-    if (property_get_bool("vendor.audio.apptype.multirec.enabled", false))
+    if (property_get_bool("persist.vendor.audio.apptype.multirec.enabled", false))
         my_data->use_generic_handset = true;
 
     /* Initialize keep alive for HDMI/loopback silence */