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

Commit 7731f9e7 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Treat failure to create a process group as fatal" am: 75eb2481... 

Merge "Merge "Treat failure to create a process group as fatal" am: 75eb2481 am: bf58a328 am: 2bc65487 am: 9afc35a3" into tm-qpr-dev-plus-aosp
parents cae15dbe 41301885

core/jni/com_android_internal_os_Zygote.cpp

+5 −4
Original line number Diff line number Diff line
@@ -1599,10 +1599,11 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids, 
    // since the directory is owned by root.

    if (!is_system_server && getuid() == 0) {

        const int rc = createProcessGroup(uid, getpid());

        if (rc == -EROFS) {

            ALOGW("createProcessGroup failed, kernel missing CONFIG_CGROUP_CPUACCT?");

        } else if (rc != 0) {

            ALOGE("createProcessGroup(%d, %d) failed: %s", uid, /* pid= */ 0, strerror(-rc));

        if (rc != 0) {

            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)));

        }

    }

services/core/java/com/android/server/am/ProcessList.java

+2 −2
Original line number Diff line number Diff line
@@ -2307,8 +2307,8 @@ public final class ProcessList { 
            if (!regularZygote) {

                // webview and app zygote don't have the permission to create the nodes

                if (Process.createProcessGroup(uid, startResult.pid) < 0) {

                    Slog.e(ActivityManagerService.TAG, "Unable to create process group for "

                            + app.processName + " (" + startResult.pid + ")");

                    throw new AssertionError("Unable to create process group for " + app.processName

                            + " (" + startResult.pid + ")");

                }

            }