commit d9533c21d3d2679c95672a61f2e68568064db764
author Jon Spivack <spivack@google.com> Mon Jan 27 22:19:22 2020 +0000
committer Jon Spivack <spivack@google.com> Wed Jan 29 05:09:14 2020 +0000
tree c19149065026c9859cafca0bffe2429a35ac9df9
parent 9e7e75fe5ab7772145960ae251856f58890de328

Revert^2 "Dynamically stop services with multiple interfaces"

37f70cc1029e8e984e60f485db59d6e6889cbb1b

Reason for revert: This undoes the previous reversion, which was made to fix b/148282665.

Change-Id: Ie855de284969af5dc937dc95daae84c3df107d32

cmds/servicemanager/ServiceManager.h

diff --git a/cmds/servicemanager/ServiceManager.h b/cmds/servicemanager/ServiceManager.h
index 77f5250..a2fc5a8 100644
--- a/cmds/servicemanager/ServiceManager.h
+++ b/cmds/servicemanager/ServiceManager.h
@@ -75,7 +75,7 @@
     void removeRegistrationCallback(const wp<IBinder>& who,
                         ServiceCallbackMap::iterator* it,
                         bool* found);
-    ssize_t handleServiceClientCallback(const std::string& serviceName);
+    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);
     // removes a callback from mNameToClientCallback, deleting the entry if the vector is empty