diff options
| author | Jiyong Park <jiyong@google.com> | 2019-08-09 09:53:34 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2019-08-09 12:46:17 +0900 |
| commit | 96ad71a9706ae6512c478be1416c01af1d63190d (patch) | |
| tree | 05ea21c9dd7d37c0e8c2f5bd4eaf97ace784b5c9 | |
| parent | aac4984dc11112b11e3a4cf6661dcf540350a23e (diff) | |
| download | android_hardware_qcom_audio-96ad71a9706ae6512c478be1416c01af1d63190d.tar.gz android_hardware_qcom_audio-96ad71a9706ae6512c478be1416c01af1d63190d.tar.bz2 android_hardware_qcom_audio-96ad71a9706ae6512c478be1416c01af1d63190d.zip | |
Fix incorrect sysprop name
Starting from Q-launching devices, sysprops defined by vendor should
start with vendor. or ro.vendor. Therefore, renaming
ro.qc.sdk.audio.fluencetype to ro.vendor.audio.sdk.fluencetype. For
legacy compatibility, the HAL reads both sysprops; first the new one and
then falls back to the old one.
Bug: 139108926
Test: making a video call via Duo, make sure sound works
Test: vol adjust during a phone call works
Change-Id: I54babf96de702a142cbe860f59d6b5b011bfa374
| -rw-r--r-- | hal/msm8916/platform.c | 4 | ||||
| -rw-r--r-- | hal/msm8974/platform.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c index 3602b973..8600b7dc 100644 --- a/hal/msm8916/platform.c +++ b/hal/msm8916/platform.c @@ -1118,7 +1118,9 @@ void *platform_init(struct audio_device *adev) 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"))) { diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c index 41d8bd28..8a2fc183 100644 --- a/hal/msm8974/platform.c +++ b/hal/msm8974/platform.c @@ -1805,7 +1805,9 @@ void *platform_init(struct audio_device *adev) 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)) { |