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

Commit 179a074f authored by Aniket Kumar Lata's avatar Aniket Kumar Lata Committed by Andy Hung
Browse files

audioflinger: fix redundant adding to tracksToRemove 



In order to avoid track to be added to tracksToRemove
redundantly, merge the adding operation under exclusive
condition check.
This can make sure the add can happen only one time within
one prepareTracks iterator.

authored-by: default avatarZhou Song <zhous@codeaurora.org>

Test: AF active track removal with audio playback pause
Bug: 123375253
Change-Id: If35348af2144a28b84241e1cb93f497d5eec9a8a
parent 186f4ac0

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;

                    }