Snap for 5794870 from c22b4fc5c4ad5311af164aca6205d18247b5baa3 to qt-qpr1-release

Change-Id: Id6cbf12b6fb3545bf7cbb5c5ce51f78a67d30611

3 files changed, 6 insertions, 15 deletions

diff --git a/hal/audio_extn/utils.c b/hal/audio_extn/utils.c
index 0a8e18f4..3a1877ba 100644
--- a/hal/audio_extn/utils.c
+++ b/hal/audio_extn/utils.c
@@ -541,9 +541,7 @@ int audio_extn_utils_get_snd_card_num()
     struct acdb_platform_data *my_data = calloc(1, sizeof(struct acdb_platform_data));
 
     bool card_verifed[MAX_SND_CARD] = {0};
-    const int retry_limit = property_get_int32(
-        "vendor.audio.snd_card.open.retries",
-        property_get_int32("audio.snd_card.open.retries", RETRY_NUMBER));
+    const int retry_limit = property_get_int32("audio.snd_card.open.retries", RETRY_NUMBER);
 
     for (;;) {
         if (snd_card_num >= MAX_SND_CARD) {
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 58d8f856..1fd913a7 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -6568,8 +6568,7 @@ static int adev_open(const hw_module_t *module, const char *name,
 
     char value[PROPERTY_VALUE_MAX];
     int trial;
-    if ((property_get("vendor.audio_hal.period_size", value, NULL) > 0) ||
-        (property_get("audio_hal.period_size", value, NULL) > 0)) {
+    if (property_get("audio_hal.period_size", value, NULL) > 0) {
         trial = atoi(value);
         if (period_size_is_plausible_for_low_latency(trial)) {
             pcm_config_low_latency.period_size = trial;
@@ -6578,8 +6577,7 @@ static int adev_open(const hw_module_t *module, const char *name,
             configured_low_latency_capture_period_size = trial;
         }
     }
-    if ((property_get("vendor.audio_hal.in_period_size", value, NULL) > 0) ||
-        (property_get("audio_hal.in_period_size", value, NULL) > 0)) {
+    if (property_get("audio_hal.in_period_size", value, NULL) > 0) {
         trial = atoi(value);
         if (period_size_is_plausible_for_low_latency(trial)) {
             configured_low_latency_capture_period_size = trial;
@@ -6594,8 +6592,7 @@ static int adev_open(const hw_module_t *module, const char *name,
     // audio_extn_utils_send_default_app_type_cfg(adev->platform, adev->mixer);
     audio_device_ref_count++;
 
-    if ((property_get("vendor.audio_hal.period_multiplier", value, NULL) > 0) ||
-        (property_get("audio_hal.period_multiplier", value, NULL) > 0)) {
+    if (property_get("audio_hal.period_multiplier", value, NULL) > 0) {
         af_period_multiplier = atoi(value);
         if (af_period_multiplier < 0) {
             af_period_multiplier = 2;
diff --git a/post_proc/volume_listener.c b/post_proc/volume_listener.c
index ea26860d..0fb62cb8 100644
--- a/post_proc/volume_listener.c
+++ b/post_proc/volume_listener.c
@@ -674,12 +674,8 @@ static void init_once()
         }
     }
 
-    dumping_enabled = property_get_bool(
-        "vendor.audio.volume.listener.dump",
-        property_get_bool("audio.volume.listener.dump", false));
-    headset_cal_enabled = property_get_bool(
-        "vendor.audio.volume.headset.gain.depcal",
-        property_get_bool("audio.volume.headset.gain.depcal", false));
+    dumping_enabled = property_get_bool("audio.volume.listener.dump", false);
+    headset_cal_enabled = property_get_bool("audio.volume.headset.gain.depcal", false);
     init_status = 0;
     list_init(&vol_effect_list);
     initialized = true;