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

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

Merge "Revert "audioflinger: don't call flush/resume if track is removed"" into av-aosp.lnx.2.0-dev

parents eae5335a b1d0f3c2

services/audioflinger/Threads.cpp

+1 −3
Original line number Diff line number Diff line
@@ -4863,13 +4863,11 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::DirectOutputThread::prep 
    // If a flush is pending and a track is active but the HW is not paused, force a HW pause

    // before flush and then resume HW. This can happen in case of pause/flush/resume

    // if resume is received before pause is executed.

    bool paused = false;

    if (mHwSupportsPause && !mStandby &&

            (doHwPause || (mFlushPending && !mHwPaused && (count != 0)))) {

        mOutput->stream->pause(mOutput->stream);

        paused = true;

    }

    if (mFlushPending && paused) {

    if (mFlushPending) {

        flushHw_l();

    }

    if (mHwSupportsPause && !mStandby && doHwResume) {