commit aac4984dc11112b11e3a4cf6661dcf540350a23e
author Jiyong Park <jiyong@google.com> Fri Aug 09 09:53:34 2019 +0900
committer Jiyong Park <jiyong@google.com> Fri Aug 09 12:46:04 2019 +0900
tree 2f4397f349ae0ab4463fc3213b0ae5dc96ccea66
parent 25054b7a665f02f441169353514116fa9d772953

Revert "Revert "Read both vendor.audio_hal.* and audio_hal.* sysprops""

This reverts commit 25054b7a665f02f441169353514116fa9d772953.

Bug: 139108926
Test: making a video call via Duo, make sure sound works
Test: vol adjust during a phone call works
Change-Id: Iea2371c79aa8061009a4f26f0574f1e1ea5742c9

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 1fd913a..58d8f85 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -6568,7 +6568,8 @@
 
     char value[PROPERTY_VALUE_MAX];
     int trial;
-    if (property_get("audio_hal.period_size", value, NULL) > 0) {
+    if ((property_get("vendor.audio_hal.period_size", value, NULL) > 0) ||
+        (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;
@@ -6577,7 +6578,8 @@
             configured_low_latency_capture_period_size = trial;
         }
     }
-    if (property_get("audio_hal.in_period_size", value, NULL) > 0) {
+    if ((property_get("vendor.audio_hal.in_period_size", value, NULL) > 0) ||
+        (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;
@@ -6592,7 +6594,8 @@
     // audio_extn_utils_send_default_app_type_cfg(adev->platform, adev->mixer);
     audio_device_ref_count++;
 
-    if (property_get("audio_hal.period_multiplier", value, NULL) > 0) {
+    if ((property_get("vendor.audio_hal.period_multiplier", value, NULL) > 0) ||
+        (property_get("audio_hal.period_multiplier", value, NULL) > 0)) {
         af_period_multiplier = atoi(value);
         if (af_period_multiplier < 0) {
             af_period_multiplier = 2;