Revert "servicemanager: fix lazy service issues"

This reverts commit 0db2addca8284f79cc5e9a4d97a1effa5142fe1e.

Reason for revert: b/267519452

Change-Id: I8c5395fa33799491b0f6e3cb4614b0ca2b68dbb4

1 files changed, 1 insertions, 5 deletions

diff --git a/cmds/servicemanager/ServiceManager.h b/cmds/servicemanager/ServiceManager.h
index 3aa6731eb3..f9d4f8fd90 100644
--- a/cmds/servicemanager/ServiceManager.h
+++ b/cmds/servicemanager/ServiceManager.h
@@ -80,8 +80,6 @@ private:
 
         // the number of clients of the service, including servicemanager itself
         ssize_t getNodeStrongRefCount();
-
-        ~Service();
     };
 
     using ServiceCallbackMap = std::map<std::string, std::vector<sp<IServiceCallback>>>;
@@ -93,9 +91,7 @@ private:
     void removeRegistrationCallback(const wp<IBinder>& who,
                         ServiceCallbackMap::iterator* it,
                         bool* found);
-    // returns whether there are known clients in addition to the count provided
-    bool handleServiceClientCallback(size_t knownClients, const std::string& serviceName,
-                                     bool isCalledOnInterval);
+    ssize_t handleServiceClientCallback(const std::string& serviceName, bool isCalledOnInterval);
     // Also updates mHasClients (of what the last callback was)
     void sendClientCallbackNotifications(const std::string& serviceName, bool hasClients,
                                          const char* context);