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

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

Merge changes from topic "audio-hal-vsid" into pi-dev 

* changes:
  audio-hal: Use call state to ensure voice call start
  Revert "audio-hal: Update voice 'in_call' flag"
parents 72ad1787 a5c9da12

hal/audio_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -2602,7 +2602,7 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs) 
            out->devices = new_dev;



            if (output_drives_call(adev, out)) {

                if (!voice_is_in_call(adev)) {

                if (!voice_is_call_state_active(adev)) {

                    if (adev->mode == AUDIO_MODE_IN_CALL) {

                        adev->current_call_output = out;

                        ret = voice_start_call(adev);

hal/voice_extn/voice_extn.c

+0 −7
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ static int update_calls(struct audio_device *adev) 
    struct voice_session *session = NULL;

    int fd = 0;

    int ret = 0;

    bool is_voice_sess_active = false;



    ALOGD("%s: enter:", __func__);
@@ -223,12 +222,6 @@ static int update_calls(struct audio_device *adev) 
                          __func__, usecase_id);

                } else {

                    session->state.current = session->state.new;



                    // The flag is not reset if another voice session is active as routing/mode is

                    // set globally instead of per session.

                    voice_extn_is_call_state_active(adev, &is_voice_sess_active);

                    if (!is_voice_sess_active)

                        adev->voice.in_call = false;

                }

                break;