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

Commit 1342d074 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "audioflinger: fix redundant adding to tracksToRemove"

parents 318690ab 179a074f

services/audioflinger/Threads.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;

                    }