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

Commit 2aa6c4b5 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Bug 5031179 possible fix for assert in join"

parents 600449c6 2c751a84
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -96,9 +96,14 @@ OMX::CallbackDispatcher::~CallbackDispatcher() {
        mQueueChanged.signal();
    }

    // Don't call join on myself
    // A join on self can happen if the last ref to CallbackDispatcher
    // is released within the CallbackDispatcherThread loop
    status_t status = mThread->join();
    CHECK(status == NO_ERROR);
    if (status != WOULD_BLOCK) {
        // Other than join to self, the only other error return codes are
        // whatever readyToRun() returns, and we don't override that
        CHECK_EQ(status, NO_ERROR);
    }
}

void OMX::CallbackDispatcher::post(const omx_message &msg) {