tequilaOS/platform_frameworks_native
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "ServiceManager: Check guaranteeClient before unregistering services" into rvc-dev

Browse source
This commit is contained in:
TreeHugger Robot 2020-03-28 00:33:39 +00:00 committed by Android (Google) Code Review
commit edbc86de05
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmds/servicemanager/ServiceManager.cpp
View file

@ -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.