Snap for 6626737 from d036dbfbc0d7f610b3ee4604829578d9a7027a21 to mainline-release
Change-Id: Id5585dafef2f282e3cfb3b14d22b562d52df094e
diff --git a/ServiceManager.cpp b/ServiceManager.cpp
index 165a8d9..85d4974 100644
--- a/ServiceManager.cpp
+++ b/ServiceManager.cpp
@@ -284,6 +284,12 @@
// Let HidlService know that we handed out a client. If the client drops the service before the
// next time handleClientCallbacks is called, it will still know that the service had been handed out.
hidlService->guaranteeClient();
+ forEachExistingService([&] (HidlService *otherService) {
+ if (otherService != hidlService && interfacesEqual(service, otherService->getService())) {
+ otherService->guaranteeClient();
+ }
+ return true;
+ });
// This is executed immediately after the binder driver confirms the transaction. The driver
// will update the appropriate data structures to reflect the fact that the client now has the
