commit 1e5c6cc6629d92059720118bac6755b0486cf69b
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 21 03:29:56 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 21 03:29:56 2020 +0000
tree 2097c08c168bdae6980ed945293f9e772d4f6669
parent 1c838967a0de30e52a47e437d1b980a73f8d2413
parent a686bf7989f64eca0dc17fbc79edcd81604c79cc

Merge "LazyServiceRegistrar: Use defaultServiceManager" am: 7f9edd9bff am: 3e7c0f4069 am: a686bf7989

Change-Id: Ic4983a30ac00e0d1f9beb737e917963678a57782

libs/binder/LazyServiceRegistrar.cpp

diff --git a/libs/binder/LazyServiceRegistrar.cpp b/libs/binder/LazyServiceRegistrar.cpp
index f064bd7..71d8130 100644
--- a/libs/binder/LazyServiceRegistrar.cpp
+++ b/libs/binder/LazyServiceRegistrar.cpp
@@ -64,8 +64,7 @@
 
 bool ClientCounterCallback::registerService(const sp<IBinder>& service, const std::string& name,
                                             bool allowIsolated, int dumpFlags) {
-    auto manager = interface_cast<AidlServiceManager>(
-                    ProcessState::self()->getContextObject(nullptr));
+    auto manager = interface_cast<AidlServiceManager>(asBinder(defaultServiceManager()));
 
     bool reRegister = mRegisteredServices.count(name) > 0;
     std::string regStr = (reRegister) ? "Re-registering" : "Registering";
@@ -114,9 +113,7 @@
 void ClientCounterCallback::tryShutdown() {
     ALOGI("Trying to shut down the service. No clients in use for any service in process.");
 
-    // This makes the same assumption as IServiceManager.cpp. Could dedupe if used in more places.
-    auto manager = interface_cast<AidlServiceManager>(
-            ProcessState::self()->getContextObject(nullptr));
+    auto manager = interface_cast<AidlServiceManager>(asBinder(defaultServiceManager()));
 
     auto unRegisterIt = mRegisteredServices.begin();
     for (; unRegisterIt != mRegisteredServices.end(); ++unRegisterIt) {