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

Commit 130242db authored by Steven Moreland's avatar Steven Moreland
Browse files

servicemanager: add sanity check in destructor 

Documenting some invariants. Since I am adding some more APIs, I want
this to be explicit.

Bug: 136027762
Test: servicemanager_test
Change-Id: I67da9d92c3a457926739fb1f02411a57caefa5b8
parent f2338f0f

cmds/servicemanager/ServiceManager.cpp

+7 −0
Original line number Diff line number Diff line
@@ -25,6 +25,13 @@ using ::android::binder::Status; 
namespace android {



ServiceManager::ServiceManager(std::unique_ptr<Access>&& access) : mAccess(std::move(access)) {}

ServiceManager::~ServiceManager() {

    // this should only happen in tests



    for (const auto& [name, service] : mNameToService) {

        CHECK(service.binder != nullptr) << name;

    }

}



Status ServiceManager::getService(const std::string& name, sp<IBinder>* outBinder) {

    // Servicemanager is single-threaded and cannot block. This method exists for legacy reasons.

cmds/servicemanager/ServiceManager.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ namespace android { 
class ServiceManager : public os::BnServiceManager, public IBinder::DeathRecipient {

public:

    ServiceManager(std::unique_ptr<Access>&& access);

    ~ServiceManager();



    binder::Status getService(const std::string& name, sp<IBinder>* outBinder) override;

    binder::Status checkService(const std::string& name, sp<IBinder>* outBinder) override;