commit dfbc64d8aaec220e631b60d6608b4fe35318d30a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Sep 11 20:42:59 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 11 20:42:59 2023 +0000
tree ee2aec5d761b7e1d358951cdd283e5931fab0250
parent fe3deb07dcddef7fa0c1ea85fdb6709906260862
parent ecef005ae609ada3d882e706e20cdec5ff8e0d4f

Merge "Revert "Treat process group creation failure due to a dead process as non-fatal"" into main

core/jni/com_android_internal_os_Zygote.cpp

diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index bbaea0a..418000f 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -1806,15 +1806,10 @@
     if (!is_system_server && getuid() == 0) {
         const int rc = createProcessGroup(uid, getpid());
         if (rc != 0) {
-            if (rc == -ESRCH) {
-                // If process is dead, treat this as a non-fatal error
-                ALOGE("createProcessGroup(%d, %d) failed: %s", uid, /* pid= */ 0, strerror(-rc));
-            } else {
-                fail_fn(rc == -EROFS ? CREATE_ERROR("createProcessGroup failed, kernel missing "
-                                                    "CONFIG_CGROUP_CPUACCT?")
-                                     : CREATE_ERROR("createProcessGroup(%d, %d) failed: %s", uid,
-                                                    /* pid= */ 0, strerror(-rc)));
-            }
+            fail_fn(rc == -EROFS ? CREATE_ERROR("createProcessGroup failed, kernel missing "
+                                                "CONFIG_CGROUP_CPUACCT?")
+                                 : CREATE_ERROR("createProcessGroup(%d, %d) failed: %s", uid,
+                                                /* pid= */ 0, strerror(-rc)));
         }
     }