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

Commit 16ad2abc 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

Change-Id: Ida8ca98ab23ad38a8b9b152bcbf2bdc2d25dfb69
parents d73f82a5 131b3b3e

services/core/jni/BroadcastRadio/NativeCallbackThread.cpp

+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();