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

Commit 3ee22f5f authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of audio-userspace.lnx.2.1.c1-00016. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1055025   Icf6b7484f163e46a8ddf3efbca1f780affd76ada   hal: fix noise heard in single song repeat mode
1077839   I06ea1b25f32afb54c4562381eba2253fa7f3beeb   Revert "hal: fix no sound issue in voice call"

Change-Id: I61a2e5937edec90437612ab720d1d70f7f729e37
CRs-Fixed: 1055025, 1077839
parents 5a8a6257 bcf280c5

hal/audio_hw.c

+6 −2
Original line number Diff line number Diff line
@@ -3039,8 +3039,12 @@ static int out_flush(struct audio_stream_out* stream) 
    if (is_offload_usecase(out->usecase)) {

        ALOGD("copl(%p):calling compress flush", out);

        lock_output_stream(out);

        if (out->offload_state == OFFLOAD_STATE_PAUSED) {

            stop_compressed_output_l(out);

            out->written = 0;

        } else {

            ALOGW("%s called in invalid state %d", __func__, out->offload_state);

        }

        pthread_mutex_unlock(&out->lock);

        ALOGD("copl(%p):out of compress flush", out);

        return 0;

hal/voice.c

+0 −3
Original line number Diff line number Diff line
@@ -118,9 +118,6 @@ int voice_stop_usecase(struct audio_device *adev, audio_usecase_t usecase_id) 


    session->state.current = CALL_INACTIVE;



    if (!voice_is_call_state_active(adev))

        adev->voice.in_call = false;



    /* Disable sidetone only when no calls are active */

    if (!voice_is_call_state_active(adev))

        voice_set_sidetone(adev, uc_info->out_snd_device, false);