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

Commit cbe95392 authored by Jon Spivack's avatar Jon Spivack Committed by Gerrit Code Review
Browse files

Merge "ServiceManager: Check guaranteeClient before unregistering services"

parents 8e929406 0f18f2c3

cmds/servicemanager/ServiceManager.cpp

+5 −0
Original line number Diff line number Diff line
@@ -522,6 +522,11 @@ Status ServiceManager::tryUnregisterService(const std::string& name, const sp<IB 
        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE);

    }



    if (serviceIt->second.guaranteeClient) {

        LOG(INFO) << "Tried to unregister " << name << ", but there is about to be a client.";

        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE);

    }



    int clients = handleServiceClientCallback(name, false);



    // clients < 0: feature not implemented or other error. Assume clients.