Zygote: make libprocessgroup failures non-fatal

createProcessGroup can fail if the kernel does not support the
cpuacct cgroup.  Print a more useful error message, and don't
runtime abort.

Bug: 16243791
Change-Id: Ibbf081bda58a99c83b8070f55d151905c706b378

1 files changed, 5 insertions, 2 deletions

diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index 989b60eef0d2..64366e5a0467 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -439,8 +439,11 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra
     if (!is_system_server) {
         int rc = createProcessGroup(uid, getpid());
         if (rc != 0) {
-            ALOGE("createProcessGroup(%d, %d) failed: %s", uid, pid, strerror(-rc));
-            RuntimeAbort(env);
+            if (rc == -EROFS) {
+                ALOGW("createProcessGroup failed, kernel missing CONFIG_CGROUP_CPUACCT?");
+            } else {
+                ALOGE("createProcessGroup(%d, %d) failed: %s", uid, pid, strerror(-rc));
+            }
         }
     }