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

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

Merge "RpcServer::setupSocketServer prevent race" am: f2850b36 

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

Change-Id: I8a6c74e5256c83b2186a4eaa2e4cdbee747d4432
parents 3d8abec5 f2850b36

libs/binder/RpcServer.cpp

+4 −1
Original line number Diff line number Diff line
@@ -255,7 +255,10 @@ bool RpcServer::setupSocketServer(const RpcSocketAddress& addr) { 


    LOG_RPC_DETAIL("Successfully setup socket server %s", addr.toString().c_str());



    mServer = std::move(serverFd);

    if (!setupExternalServer(std::move(serverFd))) {

        ALOGE("Another thread has set up server while calling setupSocketServer. Race?");

        return false;

    }

    return true;

}