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

Commit 7d7d3210 authored by Phil Burk's avatar Phil Burk Committed by Android (Google) Code Review
Browse files

Merge "audioflinger: do not call onTearDown() in threadLoop_exit()" into oc-mr1-dev

parents 60b25e9b 7dce7281

services/audioflinger/Threads.cpp

+2 −4
Original line number Original line Diff line number Diff line
@@ -8148,10 +8148,8 @@ void AudioFlinger::MmapThread::threadLoop_standby() 




void AudioFlinger::MmapThread::threadLoop_exit()

void AudioFlinger::MmapThread::threadLoop_exit()

{

{

    sp<MmapStreamCallback> callback = mCallback.promote();

    // Do not call callback->onTearDown() because it is redundant for thread exit

    if (callback != 0) {

    // and because it can cause a recursive mutex lock on stop().

        callback->onTearDown();

    }

}

}





status_t AudioFlinger::MmapThread::setSyncEvent(const sp<SyncEvent>& event __unused)

status_t AudioFlinger::MmapThread::setSyncEvent(const sp<SyncEvent>& event __unused)