| commit | 270959a33668dceab1a7198c91ece6aeff18f021 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Mar 14 01:17:55 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 14 01:17:55 2023 +0000 |
| tree | 2d741fe0dccfbf2329d4862bbd239aea054fe5bf | |
| parent | 09047e236686cb001c5e64bd863fa03239b123de [diff] | |
| parent | a6b295b95e5141cde79544df9eff765d3f3f82fb [diff] |
Merge "Stop respawning serial console if disabled" am: a6b295b95e Original change: https://android-review.googlesource.com/c/platform/system/core/+/2485621 Change-Id: I7cd7e1bd58b65e52dbfff4b3b2ba197f10cc8b9f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/init/service.cpp b/init/service.cpp index 8456d1e..35beaad 100644 --- a/init/service.cpp +++ b/init/service.cpp
@@ -453,6 +453,7 @@ // disable services requiring the console. For older kernels and boot // images, not setting this at all will fall back to the old behavior if (GetProperty("ro.boot.serialconsole", "") == "0") { + flags_ |= SVC_DISABLED; return {}; }