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

Commit aee1631f 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

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



Change-Id: I83feb1b0cbd40536a82558d8518541cba23c04e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bb0888bc 0c573ca6

services/audioflinger/Threads.cpp

+3 −0
Original line number Diff line number Diff line
@@ -2825,6 +2825,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;

    }