Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 621a6ca1 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

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

am: 46c397f3

Change-Id: I2a6376652a948edf4a4a4d4d6e71ac5b58e97f98
parents bdee0a01 46c397f3

cmds/servicemanager/main.cpp

+4 −5
Original line number Original line Diff line number Diff line
@@ -38,14 +38,13 @@ int main(int argc, char** argv) { 




    android::base::InitLogging(nullptr, &android::base::KernelLogger);

    android::base::InitLogging(nullptr, &android::base::KernelLogger);





    ProcessState::self()->initWithDriver(driver);

    sp<ProcessState> ps = ProcessState::initWithDriver(driver);

    ProcessState::self()->setThreadPoolMaxThreadCount(0);

    ps->setThreadPoolMaxThreadCount(0);

    ProcessState::self()->setCallRestriction(

    ps->setCallRestriction(ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY);

        ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY);





    sp<ServiceManager> manager = new ServiceManager(std::make_unique<Access>());

    sp<ServiceManager> manager = new ServiceManager(std::make_unique<Access>());

    IPCThreadState::self()->setTheContextObject(manager);

    IPCThreadState::self()->setTheContextObject(manager);

    ProcessState::self()->becomeContextManager(nullptr, nullptr);

    ps->becomeContextManager(nullptr, nullptr);





    IPCThreadState::self()->joinThreadPool();

    IPCThreadState::self()->joinThreadPool();