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

Commit 1b07c468 authored by Ravi Kumar Alamanda's avatar Ravi Kumar Alamanda Committed by Android Git Automerger
Browse files

am 02317798: qcom/audio/hal: Do not enable Fluence in speaker mode by default 

* commit '02317798':
  qcom/audio/hal: Do not enable Fluence in speaker mode by default
parents c3db47c1 02317798

hal/audio_hw.c

+8 −2
Original line number Diff line number Diff line
@@ -530,10 +530,10 @@ static snd_device_t get_input_snd_device(struct audio_device *adev) 
        } else if (out_device & AUDIO_DEVICE_OUT_ALL_SCO) {

            snd_device = SND_DEVICE_IN_BT_SCO_MIC ;

        } else if (out_device & AUDIO_DEVICE_OUT_SPEAKER) {

            if (adev->fluence_in_voice_call &&

            if (adev->fluence_in_voice_call && adev->fluence_in_spkr_mode &&

                    adev->dualmic_config == DUALMIC_CONFIG_ENDFIRE) {

                snd_device = SND_DEVICE_IN_VOICE_SPEAKER_DMIC_EF;

            } else if (adev->fluence_in_voice_call &&

            } else if (adev->fluence_in_voice_call && adev->fluence_in_spkr_mode &&

                       adev->dualmic_config == DUALMIC_CONFIG_BROADSIDE) {

                snd_device = SND_DEVICE_IN_VOICE_SPEAKER_DMIC_BS;

            } else {
@@ -1959,6 +1959,7 @@ static void init_platform_data(struct audio_device *adev) 
    char value[PROPERTY_VALUE_MAX];



    adev->dualmic_config = DUALMIC_CONFIG_NONE;

    adev->fluence_in_spkr_mode = false;

    adev->fluence_in_voice_call = false;

    adev->fluence_in_voice_rec = false;

    adev->mic_type_analog = false;
@@ -1986,6 +1987,11 @@ static void init_platform_data(struct audio_device *adev) 
        if (!strncmp("true", value, 4)) {

            adev->fluence_in_voice_rec = true;

        }



        property_get("persist.audio.fluence.speaker",value,"");

        if (!strncmp("true", value, 4)) {

            adev->fluence_in_spkr_mode = true;

        }

    }



    adev->acdb_handle = dlopen(LIB_ACDB_LOADER, RTLD_NOW);

hal/audio_hw.h

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ struct audio_device { 
    int acdb_settings;



    bool mic_type_analog;

    bool fluence_in_spkr_mode;

    bool fluence_in_voice_call;

    bool fluence_in_voice_rec;

    int  dualmic_config;