| commit | 5441a804466f677f8e23eab8e84307362d5bf22d | [log] [tgz] |
|---|---|---|
| author | Suren Baghdasaryan <surenb@google.com> | Wed May 04 16:33:18 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 04 16:33:18 2022 +0000 |
| tree | dc4dbe5f0edffaa25093394a687f53cedf16580f | |
| parent | f98610b80804aea845cb3201cba02e4a446d00f8 [diff] | |
| parent | e31c7a17e51ecd311bbd1ef4219276ead8ff0353 [diff] |
Merge changes from topic "228160715_fix" into tm-dev am: e31c7a17e5 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/18090771 Change-Id: I57f66433d40274f0535e31c0550884744df4636e 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 0f24437..3fa935f 100644 --- a/init/service.cpp +++ b/init/service.cpp
@@ -289,6 +289,10 @@ if (flags_ & SVC_EXEC) UnSetExec(); + if (name_ == "zygote" || name_ == "zygote64") { + removeAllEmptyProcessGroups(); + } + if (flags_ & SVC_TEMPORARY) return; pid_ = 0;