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

Commit 7f0218eb authored by Haofan Wang's avatar Haofan Wang Committed by Automerger Merge Worker
Browse files

Merge "AudioFlinger: do not reset mHwPaused on flush" into main am: c4684ce8 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3117855



Change-Id: I4904692a80ad9d92630418ad9ae76c3f0be8bad9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dff01e6e c4684ce8

services/audioflinger/Threads.cpp

+4 −1
Original line number Diff line number Diff line
@@ -7165,11 +7165,14 @@ void DirectOutputThread::flushHw_l() 
{

    PlaybackThread::flushHw_l();

    mOutput->flush();

    mHwPaused = false;

    mFlushPending = false;

    mTimestampVerifier.discontinuity(discontinuityForStandbyOrFlush());

    mTimestamp.clear();

    mMonotonicFrameCounter.onFlush();

    // We do not reset mHwPaused which is hidden from the Track client.

    // Note: the client track in Tracks.cpp and AudioTrack.cpp

    // has a FLUSHED state but the DirectOutputThread does not;

    // those tracks will continue to show isStopped().

}



int64_t DirectOutputThread::computeWaitTimeNs_l() const {