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

Commit 6933a10d authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "servicemanager: fatal if not ctx mgr" am: a06d5455 am: fd133c02 am:... 

Merge "servicemanager: fatal if not ctx mgr" am: a06d5455 am: fd133c02 am: 22c15c5e am: f992c449

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2582978



Change-Id: I413113d4c96fe9466f2d3bd770909404a1d0ef0f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1ae73fa9 f992c449

cmds/servicemanager/main.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -132,8 +132,7 @@ int main(int argc, char** argv) { 




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

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

    if (!ps->becomeContextManager()) {

    if (!ps->becomeContextManager()) {

        LOG(ERROR) << "Could not become context manager";

        LOG(FATAL) << "Could not become context manager";

        // TODO(b/280514080): fatal

    }

    }





    sp<Looper> looper = Looper::prepare(false /*allowNonCallbacks*/);

    sp<Looper> looper = Looper::prepare(false /*allowNonCallbacks*/);