Merge "audioflinger: fix redundant adding to tracksToRemove"

5 years ago · 1342d0740e
parent 318690abd1 179a074f27
commit 1342d0740e
1 changed files with 2 additions and 2 deletions
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@ -5508,7 +5508,6 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::DirectOutputThread::prep
                doHwPause = true;
                mHwPaused = true;
            }
-            tracksToRemove->add(track);
        } else if (track->isFlushPending()) {
            track->flushAck();
            if (last) {
@ -5605,7 +5604,8 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::DirectOutputThread::prep

                int64_t framesWritten = mBytesWritten / mFrameSize;
                if (mStandby || !last ||
-                        track->presentationComplete(framesWritten, audioHALFrames)) {
+                        track->presentationComplete(framesWritten, audioHALFrames) ||
+                        track->isPaused()) {
                    if (track->isStopping_2()) {
                        track->mState = TrackBase::STOPPED;
                    }