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

Commit 59f39095 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder: better RpcSession shutdown detail logs" am: f94b148b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1767090

Change-Id: I11ce12d4ecaa5c5fc713642b03f60d830d61ffec
parents 60aa427c f94b148b

libs/binder/RpcServer.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -182,7 +182,7 @@ void RpcServer::join() { 
bool RpcServer::shutdown() {

bool RpcServer::shutdown() {

    std::unique_lock<std::mutex> _l(mLock);

    std::unique_lock<std::mutex> _l(mLock);

    if (mShutdownTrigger == nullptr) {

    if (mShutdownTrigger == nullptr) {

        LOG_RPC_DETAIL("Cannot shutdown. No shutdown trigger installed.");

        LOG_RPC_DETAIL("Cannot shutdown. No shutdown trigger installed (already shutdown?)");

        return false;

        return false;

    }

    }
@@ -212,6 +212,8 @@ bool RpcServer::shutdown() { 
        mJoinThread.reset();

        mJoinThread.reset();

    }

    }





    LOG_RPC_DETAIL("Finished waiting on shutdown.");



    mShutdownTrigger = nullptr;

    mShutdownTrigger = nullptr;

    return true;

    return true;

}

}