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

Commit aa33e856 authored by Steven Moreland's avatar Steven Moreland
Browse files

servicemanager: log missing service requestor pid 

To aid reducing logspam when clients repeatedly
request services.

Bug: N/A
Test: boot & check logs
Change-Id: I7acce0c94f00ee954d3285b3a4b94ca56b7636ef
parent 71ea90d3

cmds/servicemanager/ServiceManager.cpp

+6 −5
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ sp<IBinder> ServiceManager::tryGetService(const std::string& name, bool startIfN 
    }



    if (!out && startIfNotFound) {

        tryStartService(name);

        tryStartService(ctx, name);

    }



    if (out) {
@@ -651,10 +651,11 @@ void ServiceManager::binderDied(const wp<IBinder>& who) { 
    }

}



void ServiceManager::tryStartService(const std::string& name) {

    ALOGI("Since '%s' could not be found, trying to start it as a lazy AIDL service. (if it's not "

          "configured to be a lazy service, it may be stuck starting or still starting).",

          name.c_str());

void ServiceManager::tryStartService(const Access::CallingContext& ctx, const std::string& name) {

    ALOGI("Since '%s' could not be found (requested by debug pid %d), trying to start it as a lazy "

          "AIDL service. (if it's not configured to be a lazy service, it may be stuck starting or "

          "still starting).",

          name.c_str(), ctx.debugPid);



    std::thread([=] {

        if (!base::SetProperty("ctl.interface_start", "aidl/" + name)) {

cmds/servicemanager/ServiceManager.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public: 
    void clear();



protected:

    virtual void tryStartService(const std::string& name);

    virtual void tryStartService(const Access::CallingContext& ctx, const std::string& name);



private:

    struct Service {

cmds/servicemanager/test_sm.cpp

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public: 
class MockServiceManager : public ServiceManager {

 public:

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

    MOCK_METHOD1(tryStartService, void(const std::string& name));

    MOCK_METHOD2(tryStartService, void(const Access::CallingContext&, const std::string& name));

};



static sp<ServiceManager> getPermissiveServiceManager() {