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

Commit 131b3b3e authored by rleix's avatar rleix Committed by android-build-merger
Browse files

Merge "Fix the system_error while calling thread::join() in NativeCallbackThread." am: 56104e6f 

am: 212d9f76

Change-Id: I348670fbc7855d9c2cf6277debc115ed9fb20ef1
parents 0da4e3b6 212d9f76

services/core/jni/BroadcastRadio/NativeCallbackThread.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -106,7 +106,7 @@ void NativeCallbackThread::stop() { 
        mQueueCond.notify_one();

        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

        // 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);

        ALOGD("About to stop native callback thread %p", this);

        mThread.detach();

        mThread.detach();