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

Commit 2fe9d01c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "servicemanager: -= clients log spam" am: 896febc0 am: 9384d621 am: f6a2db44 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2471754



Change-Id: I8df00557c4726fb98dad9ae411ff36aec333f961
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da200cce f6a2db44

cmds/servicemanager/ServiceManager.cpp

+7 −2
Original line number Original line Diff line number Diff line
@@ -228,8 +228,13 @@ static bool meetsDeclarationRequirements(const sp<IBinder>& binder, const std::s 
#endif  // !VENDORSERVICEMANAGER

#endif  // !VENDORSERVICEMANAGER





ServiceManager::Service::~Service() {

ServiceManager::Service::~Service() {

    if (!hasClients) {

    if (hasClients) {

        // only expected to happen on process death

        // only expected to happen on process death, we don't store the service

        // name this late (it's in the map that holds this service), but if it

        // is happening, we might want to change 'unlinkToDeath' to explicitly

        // clear this bit so that we can abort in other cases, where it would

        // mean inconsistent logic in servicemanager (unexpected and tested, but

        // the original lazy service impl here had that bug).

        LOG(WARNING) << "a service was removed when there are clients";

        LOG(WARNING) << "a service was removed when there are clients";

    }

    }

}

}