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

Commit b9df188a authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audio: fix voice call crash on 8084 platform" into lmp-dev

parents 9ef1bd64 75a2e1d2

hal/audio_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -1337,8 +1337,8 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs) 
                    voice_stop_call(adev);

                }

                if (!voice_is_in_call(adev)) {

                    ret = voice_start_call(adev, out);

                    adev->current_call_output = out;

                    ret = voice_start_call(adev);

                } else

                    voice_update_devices_for_all_voice_usecases(adev);

            }

hal/voice.c

+5 −5
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ int voice_stop_usecase(struct audio_device *adev, audio_usecase_t usecase_id) 
    return ret;

}



int voice_start_usecase(struct audio_device *adev, audio_usecase_t usecase_id, struct stream_out *out)

int voice_start_usecase(struct audio_device *adev, audio_usecase_t usecase_id)

{

    int i, ret = 0;

    struct audio_usecase *uc_info;
@@ -109,8 +109,8 @@ int voice_start_usecase(struct audio_device *adev, audio_usecase_t usecase_id, s 
    uc_info = (struct audio_usecase *)calloc(1, sizeof(struct audio_usecase));

    uc_info->id = usecase_id;

    uc_info->type = VOICE_CALL;

    uc_info->stream.out = out;

    uc_info->devices = out->devices;

    uc_info->stream.out = adev->current_call_output ;

    uc_info->devices = adev->current_call_output ->devices;

    uc_info->in_snd_device = SND_DEVICE_NONE;

    uc_info->out_snd_device = SND_DEVICE_NONE;
@@ -323,13 +323,13 @@ int voice_set_volume(struct audio_device *adev, float volume) 
    return err;

}



int voice_start_call(struct audio_device *adev, struct stream_out *out)

int voice_start_call(struct audio_device *adev)

{

    int ret = 0;



    ret = voice_extn_start_call(adev);

    if (ret == -ENOSYS) {

        ret = voice_start_usecase(adev, USECASE_VOICE_CALL, out);

        ret = voice_start_usecase(adev, USECASE_VOICE_CALL);

    }

    adev->voice.in_call = true;

hal/voice.h

+2 −3
Original line number Diff line number Diff line
@@ -69,11 +69,10 @@ enum { 
    INCALL_REC_UPLINK_AND_DOWNLINK,

};



int voice_start_usecase(struct audio_device *adev, audio_usecase_t usecase_id,

                        struct stream_out *out);

int voice_start_usecase(struct audio_device *adev, audio_usecase_t usecase_id);

int voice_stop_usecase(struct audio_device *adev, audio_usecase_t usecase_id);



int voice_start_call(struct audio_device *adev, struct stream_out *out);

int voice_start_call(struct audio_device *adev);

int voice_stop_call(struct audio_device *adev);

int voice_set_parameters(struct audio_device *adev, struct str_parms *parms);

void voice_get_parameters(struct audio_device *adev, struct str_parms *query,