commit d9ec40cbfe00cdf6b77eb6deb8cde14f93b8beac
author Jiyong Park <jiyong@google.com> Thu Aug 15 13:26:53 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Aug 15 13:26:53 2019 -0700
tree 05ea21c9dd7d37c0e8c2f5bd4eaf97ace784b5c9
parent ed1679fa77f788deaf9f1f002fa0b124c4403f0b
parent 96ad71a9706ae6512c478be1416c01af1d63190d

Fix incorrect sysprop name
am: 96ad71a970

Change-Id: Ia9b2c61281e86637f51c52365b9eb0db5cad0c1b

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 3602b97..8600b7d 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -1118,7 +1118,9 @@
     my_data->fluence_type = FLUENCE_NONE;
     my_data->fluence_mode = FLUENCE_ENDFIRE;
 
-    property_get("ro.qc.sdk.audio.fluencetype", my_data->fluence_cap, "");
+    if (property_get("ro.vendor.audio.sdk.fluencetype", my_data->fluence_cap, NULL) == 0) {
+        property_get("ro.qc.sdk.audio.fluencetype", my_data->fluence_cap, "");
+    }
     if (!strncmp("fluencepro", my_data->fluence_cap, sizeof("fluencepro"))) {
         my_data->fluence_type = FLUENCE_QUAD_MIC | FLUENCE_DUAL_MIC;
     } else if (!strncmp("fluence", my_data->fluence_cap, sizeof("fluence"))) {

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 41d8bd2..8a2fc18 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -1805,7 +1805,9 @@
     my_data->fluence_in_voice_comm = false;
     my_data->fluence_in_voice_rec = false;
 
-    property_get("ro.qc.sdk.audio.fluencetype", value, "none");
+    if (property_get("ro.vendor.audio.sdk.fluencetype", value, NULL) == 0) {
+        property_get("ro.qc.sdk.audio.fluencetype", value, "none");
+    }
     if (!strcmp("fluencepro", value)) {
         my_data->fluence_type = FLUENCE_PRO_ENABLE;
     } else if (!strcmp("fluence", value) || (dual_mic_config)) {