commit c76d3a273d0336ffa5d71c11b7a566721eca77f1
author Andy Hung <hunga@google.com> Fri Dec 06 14:31:28 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Dec 06 14:31:28 2019 -0800
tree c72ecfb7b44f935066de9e78798705e8c7c13101
parent 883b817ab6b41fdc94da5f8eb8fe58ae7918c3fa
parent 68e641202409517bd3b1d33f22de0956150f5a99

Merge "Sometimes no audio output after playing some clips using Files.apk" am: 80a288ad82
am: 68e6412024

Change-Id: I5e08efe9101e8581156310d0051ee76d645679be

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 06ba8b0..b5592e3 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -5735,7 +5735,7 @@
                 int64_t framesWritten = mBytesWritten / mFrameSize;
                 if (mStandby || !last ||
                         track->presentationComplete(framesWritten, audioHALFrames) ||
-                        track->isPaused()) {
+                        track->isPaused() || mHwPaused) {
                     if (track->isStopping_2()) {
                         track->mState = TrackBase::STOPPED;
                     }