diff options
| author | 2023-05-18 23:37:58 +0000 | |
|---|---|---|
| committer | 2023-05-18 23:37:58 +0000 | |
| commit | 6933a10d329534ec97fffe46495d3e330c493efe (patch) | |
| tree | e31d3cd3e71a40c266ce07ae90a48a6d682fd41c | |
| parent | 1ae73fa92f139c4972aefe238b7d4dc839cd4a68 (diff) | |
| parent | f992c449b70f873d72dd65d0aefa98bb6d6c1025 (diff) | |
Merge "servicemanager: fatal if not ctx mgr" am: a06d545510 am: fd133c02fc am: 22c15c5ee9 am: f992c449b7
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2582978
Change-Id: I413113d4c96fe9466f2d3bd770909404a1d0ef0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cmds/servicemanager/main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmds/servicemanager/main.cpp b/cmds/servicemanager/main.cpp index 520d6f9e7e..86a45e61ea 100644 --- a/cmds/servicemanager/main.cpp +++ b/cmds/servicemanager/main.cpp @@ -132,8 +132,7 @@ int main(int argc, char** argv) { IPCThreadState::self()->setTheContextObject(manager); if (!ps->becomeContextManager()) { - LOG(ERROR) << "Could not become context manager"; - // TODO(b/280514080): fatal + LOG(FATAL) << "Could not become context manager"; } sp<Looper> looper = Looper::prepare(false /*allowNonCallbacks*/); |