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

Commit 9dd38ec8 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "ServiceManager: Check guaranteeClient before unregistering services"... 

Merge "ServiceManager: Check guaranteeClient before unregistering services" am: cbe95392 am: 76eb4acf am: ce275541 am: 6c45648a am: d9e5a3ab

Change-Id: I283fc4573bfbf8cba75af2720bba7c9f0718805d
parents 94e63336 d9e5a3ab

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.