diff options
| author | Andrew Chant <achant@google.com> | 2019-08-08 17:10:55 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-08 17:10:55 -0700 |
| commit | c22b4fc5c4ad5311af164aca6205d18247b5baa3 (patch) | |
| tree | edaeb61d341aa6a381f26b36880aa1a8180caa0c | |
| parent | 60fd1e1899504cb0de937d3900ba9da8f9640326 (diff) | |
| parent | 25054b7a665f02f441169353514116fa9d772953 (diff) | |
| download | android_hardware_qcom_audio-c22b4fc5c4ad5311af164aca6205d18247b5baa3.tar.gz android_hardware_qcom_audio-c22b4fc5c4ad5311af164aca6205d18247b5baa3.tar.bz2 android_hardware_qcom_audio-c22b4fc5c4ad5311af164aca6205d18247b5baa3.zip | |
Revert "Read both vendor.audio_hal.* and audio_hal.* sysprops"
am: 25054b7a66
Change-Id: Iec1540012205b0ec722d5f03403ff8c9fcc61766
| -rw-r--r-- | hal/audio_extn/utils.c | 4 | ||||
| -rw-r--r-- | hal/audio_hw.c | 9 | ||||
| -rw-r--r-- | post_proc/volume_listener.c | 8 |
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; |