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

Commit 8a08e813 authored by rleix's avatar rleix Committed by android-build-merger
Browse files

Merge "Fix the system_error while calling thread::join() in...

Merge "Fix the system_error while calling thread::join() in NativeCallbackThread." am: 56104e6f am: 212d9f76 am: 131b3b3e
am: 16ad2abc

Change-Id: I88c9c39c25970d6873aa42ec146cf35e0c2f9da6
parents 362050e8 16ad2abc
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ void NativeCallbackThread::stop() {
        mQueueCond.notify_one();
    }

    if (mThread.get_id() == std::thread::id()) {
    if (mThread.get_id() == std::this_thread::get_id()) {
        // you can't self-join a thread, but it's ok when calling from our sub-task
        ALOGD("About to stop native callback thread %p", this);
        mThread.detach();