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

Commit 606ef38a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "~RpcServer() calls shutdown explicitly." am: de10257e am: 4a0fad36... 

Merge "~RpcServer() calls shutdown explicitly." am: de10257e am: 4a0fad36 am: e028e46d am: c9c0a694

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

Change-Id: Icd13bc08a2d704896ef71844c5925a891fc46305
parents c8e2ba21 c9c0a694

libs/binder/RpcServer.cpp

+3 −2
Original line number Diff line number Diff line
@@ -39,7 +39,9 @@ using base::ScopeGuard; 
using base::unique_fd;



RpcServer::RpcServer() {}

RpcServer::~RpcServer() {}

RpcServer::~RpcServer() {

    (void)shutdown();

}



sp<RpcServer> RpcServer::make() {

    return sp<RpcServer>::make();
@@ -204,7 +206,6 @@ bool RpcServer::acceptOneNoCheck() { 
}



bool RpcServer::shutdown() {

    LOG_ALWAYS_FATAL_IF(!mAgreedExperimental, "no!");

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

    if (mShutdownTrigger == nullptr) return false;