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

Commit 4acac710 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 am: 9d83c2cd

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



Change-Id: Ifd4d967f3b3928015180dd4e4d327e06394ed2ce
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 670cab6a 9d83c2cd

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;

    }