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_extn/utils.c

diff --git a/hal/audio_extn/utils.c b/hal/audio_extn/utils.c
index 3a1877b..0a8e18f 100644
--- a/hal/audio_extn/utils.c
+++ b/hal/audio_extn/utils.c
@@ -541,7 +541,9 @@
     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("audio.snd_card.open.retries", RETRY_NUMBER);
+    const int retry_limit = property_get_int32(
+        "vendor.audio.snd_card.open.retries",
+        property_get_int32("audio.snd_card.open.retries", RETRY_NUMBER));
 
     for (;;) {
         if (snd_card_num >= MAX_SND_CARD) {