commit 3cfca323d43fc4df52c15d755c11e6270a33a24c
author Steven Moreland <smoreland@google.com> Mon Apr 24 19:16:39 2023 +0000
committer Copybara-Service <copybara-worker@google.com> Mon Apr 24 12:17:25 2023 -0700
tree 55e8f196cd55ee28143af671feed4036a4d84371
parent 56bd411d684aeda591ab45cf0c845978139c3d45

Merge "lazy AIDL services: test multiple callbacks"

GitOrigin-RevId: 1b04091c4587f2a0af4b4411049857d23b535906
Change-Id: I875dd6defc31c18d54907ae0b7c5ddee0da539b9

libs/binder/LazyServiceRegistrar.cpp

diff --git a/libs/binder/LazyServiceRegistrar.cpp b/libs/binder/LazyServiceRegistrar.cpp
index f66993f..7644806 100644
--- a/libs/binder/LazyServiceRegistrar.cpp
+++ b/libs/binder/LazyServiceRegistrar.cpp
@@ -324,6 +324,10 @@
     return *registrarInstance;
 }
 
+LazyServiceRegistrar LazyServiceRegistrar::createExtraTestInstance() {
+    return LazyServiceRegistrar();
+}
+
 status_t LazyServiceRegistrar::registerService(const sp<IBinder>& service, const std::string& name,
                                                bool allowIsolated, int dumpFlags) {
     if (!mClientCC->registerService(service, name, allowIsolated, dumpFlags)) {

libs/binder/include/binder/LazyServiceRegistrar.h

diff --git a/libs/binder/include/binder/LazyServiceRegistrar.h b/libs/binder/include/binder/LazyServiceRegistrar.h
index 2e22b84..bda3d19 100644
--- a/libs/binder/include/binder/LazyServiceRegistrar.h
+++ b/libs/binder/include/binder/LazyServiceRegistrar.h
@@ -93,7 +93,17 @@
       */
      void reRegister();
 
-   private:
+     /**
+      * Create a second instance of lazy service registrar.
+      *
+      * WARNING: dangerous! DO NOT USE THIS - LazyServiceRegistrar
+      * should be single-instanced, so that the service will only
+      * shut down when all services are unused. A separate instance
+      * is only used to test race conditions.
+      */
+     static LazyServiceRegistrar createExtraTestInstance();
+
+ private:
      std::shared_ptr<internal::ClientCounterCallback> mClientCC;
      LazyServiceRegistrar();
 };