From 37f70cc1029e8e984e60f485db59d6e6889cbb1b Mon Sep 17 00:00:00 2001 From: Jon Spivack Date: Sat, 25 Jan 2020 02:55:04 +0000 Subject: Revert "Dynamically stop services with multiple interfaces" Revert "Add aidl_lazy_test_server to Cuttlefish" Revert "Move aidl_lazy_test_server to system_ext" Revert submission 1209453-aidl-lazy-presubmit Reason for revert: b/148282665. A test has begun to fail on git_stage-aosp-master, and I need to verify whether these changes are responsible. Reverted Changes: Ib09a2460e: Add aidl_lazy_test to general-tests Ib08989356: Move aidl_lazy_test_server to system_ext I694e6ad35: Add aidl_lazy_test_server to Cuttlefish I65db12c63: Add aidl_lazy_test to presubmit I7ec80a280: Dynamically stop services with multiple interfaces... Change-Id: I6d3b589bf2861f68d2852c8def7a1f51eea7cf97 --- cmds/servicemanager/ServiceManager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmds/servicemanager/ServiceManager.h') diff --git a/cmds/servicemanager/ServiceManager.h b/cmds/servicemanager/ServiceManager.h index a2fc5a84c5..77f52506b9 100644 --- a/cmds/servicemanager/ServiceManager.h +++ b/cmds/servicemanager/ServiceManager.h @@ -75,7 +75,7 @@ private: void removeRegistrationCallback(const wp& who, ServiceCallbackMap::iterator* it, bool* found); - ssize_t handleServiceClientCallback(const std::string& serviceName, bool isCalledOnInterval); + ssize_t handleServiceClientCallback(const std::string& serviceName); // 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 -- cgit v1.2.3-59-g8ed1b