commit 46c397f34f142257cf24ee6600902a608aa65739
author Steven Moreland <smoreland@google.com> Thu Jul 11 16:13:12 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 11 16:13:12 2019 +0000
tree 932f5b9827c5a8b6d8981f0dfd5c719f6d598fad
parent be1e09860c0efc9fb59e5e3affb9eb39c145cbd1
parent 1ac84c46e89978ba0528a04b329f0f897ea61e48

Merge "Init ProcessState w/ initWithDriver." into stage-aosp-master

cmds/servicemanager/main.cpp

diff --git a/cmds/servicemanager/main.cpp b/cmds/servicemanager/main.cpp
index c8ceb42..9f6193b 100644
--- a/cmds/servicemanager/main.cpp
+++ b/cmds/servicemanager/main.cpp
@@ -38,14 +38,13 @@
 
     android::base::InitLogging(nullptr, &android::base::KernelLogger);
 
-    ProcessState::self()->initWithDriver(driver);
-    ProcessState::self()->setThreadPoolMaxThreadCount(0);
-    ProcessState::self()->setCallRestriction(
-        ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY);
+    sp<ProcessState> ps = ProcessState::initWithDriver(driver);
+    ps->setThreadPoolMaxThreadCount(0);
+    ps->setCallRestriction(ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY);
 
     sp<ServiceManager> manager = new ServiceManager(std::make_unique<Access>());
     IPCThreadState::self()->setTheContextObject(manager);
-    ProcessState::self()->becomeContextManager(nullptr, nullptr);
+    ps->becomeContextManager(nullptr, nullptr);
 
     IPCThreadState::self()->joinThreadPool();