Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3d05857 authored by Xin Li's avatar Xin Li
Browse files

Merge Coral/Flame into AOSP master 

Bug: 141248619
Change-Id: I78b7d4f589f83196c46b98dd1c9b4d4e7bab9e81
Merged-In: I5ba6a254312b8647d563ca0d279325be6d4f980d
parents 32bbb9a3 5caea6c2

hal/audio_extn/utils.c

+3 −1
Original line number Diff line number Diff line
@@ -541,7 +541,9 @@ 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("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) {

hal/audio_hw.c

+6 −3
Original line number Diff line number Diff line
@@ -6568,7 +6568,8 @@ static int adev_open(const hw_module_t *module, const char *name, 


    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 @@ static int adev_open(const hw_module_t *module, const char *name, 
            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 @@ 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("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;

hal/msm8916/platform.c

+3 −1
Original line number Diff line number Diff line
@@ -1118,7 +1118,9 @@ void *platform_init(struct audio_device *adev) 
    my_data->fluence_type = FLUENCE_NONE;

    my_data->fluence_mode = FLUENCE_ENDFIRE;



    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"))) {

hal/msm8974/platform.c

+3 −1
Original line number Diff line number Diff line
@@ -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;



    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)) {

post_proc/volume_listener.c

+6 −2
Original line number Diff line number Diff line
@@ -674,8 +674,12 @@ static void init_once() 
        }

    }



    dumping_enabled = property_get_bool("audio.volume.listener.dump", false);

    headset_cal_enabled = property_get_bool("audio.volume.headset.gain.depcal", false);

    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));

    init_status = 0;

    list_init(&vol_effect_list);

    initialized = true;