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

Commit c59e4591 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "Clarify RpcServer shutdown error for corner case" am: 42c73a38 am:... 

Merge "Clarify RpcServer shutdown error for corner case" am: 42c73a38 am: 68388d3f am: 8008b4de am: 88968f71

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



Change-Id: Idd345480cef57ff7b29c12e92a136160a7a2f21f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ead5a569 88968f71

libs/binder/RpcServer.cpp

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

    RpcMutexUniqueLock _l(mLock);

    if (mShutdownTrigger == nullptr) {

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

        LOG_RPC_DETAIL("Cannot shutdown. No shutdown trigger installed (already shutdown, or not "

                       "joined yet?)");

        return false;

    }