| commit | 3987e9d318003dff765e6f81d13b63f40474bb43 | [log] [tgz] |
|---|---|---|
| author | Haofan Wang <haofanw@google.com> | Mon Jun 17 21:22:00 2024 +0000 |
| committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Mon Jun 17 21:22:00 2024 +0000 |
| tree | 6e8d577a9f3e5480910574f24d86b24add0465f9 | |
| parent | bea10729d1dd17c504f45addcbaae9341f47dc24 [diff] [blame] |
Revert "AudioFlinger: do not reset mHwPaused on flush" This reverts commit 88f1dd08f127ca918a261428aac7928defa156c3. Reason for revert: b/347407260 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5f1ee2c965d5b15402f43c0c124e89d689bd7023) Merged-In: I5be6b7e74fe46cf263c6cc7832911685b51a7bfc Change-Id: I5be6b7e74fe46cf263c6cc7832911685b51a7bfc
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index d8eebf0..2496c37 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp
@@ -7169,14 +7169,11 @@ { 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 {