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

Commit cca1e69c authored by Phil Burk's avatar Phil Burk Committed by android-build-merger
Browse files

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

am: 7d7d3210

Change-Id: I38b1e516f67df94d9d5e08208cf83acf4fe656d7
parents c3050ced 7d7d3210
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -8148,10 +8148,8 @@ void AudioFlinger::MmapThread::threadLoop_standby()

void AudioFlinger::MmapThread::threadLoop_exit()
{
    sp<MmapStreamCallback> callback = mCallback.promote();
    if (callback != 0) {
        callback->onTearDown();
    }
    // Do not call callback->onTearDown() because it is redundant for thread exit
    // and because it can cause a recursive mutex lock on stop().
}

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