commit 39260a69ca1f66f29f250f30fde07fd628785708
author Andy Hung <hunga@google.com> Fri Dec 06 14:33:03 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Dec 06 14:33:03 2019 -0800
tree f2126fd1052011c2fe3e35559aa472581193b96e
parent a2adc8aa6c06f0e1d06c1bb6535be15f30ba26fd
parent c76d3a273d0336ffa5d71c11b7a566721eca77f1

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

Change-Id: I7c365f5f22927382788cbe7ecc4383af6565fa65

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 357e432..63bbcc6 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -5741,7 +5741,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;
                     }