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

Commit 93bf1af3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: fix Rx path mute issue during incall recording"

parents a7326a8a 2f92062a

hal/voice.c

+4 −4
Original line number Diff line number Diff line
@@ -221,11 +221,11 @@ bool voice_is_in_call(struct audio_device *adev) 
bool voice_is_in_call_rec_stream(struct stream_in *in)

{

    bool in_call_rec = false;

    int ret = 0;



    ret = voice_extn_is_in_call_rec_stream(in, &in_call_rec);

    if (ret == -ENOSYS) {

        in_call_rec = false;

    if(in->source == AUDIO_SOURCE_VOICE_DOWNLINK ||

       in->source == AUDIO_SOURCE_VOICE_UPLINK ||

       in->source == AUDIO_SOURCE_VOICE_CALL) {

       in_call_rec = true;

    }



    return in_call_rec;

hal/voice_extn/voice_extn.c

+0 −13
Original line number Diff line number Diff line
@@ -339,19 +339,6 @@ int voice_extn_is_call_state_active(struct audio_device *adev, bool *is_call_act 
    return 0;

}



int voice_extn_is_in_call_rec_stream(struct stream_in *in, bool *in_call_rec)

{

    *in_call_rec = false;



    if(in->source == AUDIO_SOURCE_VOICE_DOWNLINK ||

       in->source == AUDIO_SOURCE_VOICE_UPLINK ||

       in->source == AUDIO_SOURCE_VOICE_CALL) {

       *in_call_rec = true;

    }



    return 0;

}



void voice_extn_init(struct audio_device *adev)

{

    adev->voice.session[VOICE_SESS_IDX].vsid =  VOICE_VSID;

hal/voice_extn/voice_extn.h

+0 −6
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ int voice_extn_set_parameters(struct audio_device *adev, 
void voice_extn_get_parameters(const struct audio_device *adev,

                               struct str_parms *query,

                               struct str_parms *reply);

int voice_extn_is_in_call_rec_stream(struct stream_in *in, bool *in_call_rec);

int voice_extn_is_call_state_active(struct audio_device *adev,

                                    bool *is_call_active);

int voice_extn_get_active_session_id(struct audio_device *adev,
@@ -83,11 +82,6 @@ static int voice_extn_is_call_state_active(struct audio_device *adev __unused, 
    return -ENOSYS;

}



static int voice_extn_is_in_call_rec_stream(struct stream_in *in __unused, bool *in_call_rec __unused)

{

    return -ENOSYS;

}



static int voice_extn_get_active_session_id(struct audio_device *adev __unused,

                                            uint32_t *session_id __unused)

{