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

Commit 9d83c2cd authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "AudioFlinger: Fix destroyTrack_l sequencing for Direct tracks" am:... 

Merge "AudioFlinger:  Fix destroyTrack_l sequencing for Direct tracks" am: 1d365d2f am: 0c573ca6 am: aee1631f

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2498479



Change-Id: Ida77e49a8a3318695a59acb672c1f790bdb0c236
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 943db3f3 aee1631f

services/audioflinger/Threads.cpp

+3 −0
Original line number Diff line number Diff line
@@ -2901,6 +2901,9 @@ bool AudioFlinger::PlaybackThread::destroyTrack_l(const sp<Track>& track) 
    if (!trackActive) {

        removeTrack_l(track);

    } else if (track->isFastTrack() || track->isOffloaded() || track->isDirect()) {

        if (track->isPausePending()) {

            track->pauseAck();

        }

        track->mState = TrackBase::STOPPING_1;

    }