From 20375fe124b4bc54a2380396fd798f93fcdb3135 Mon Sep 17 00:00:00 2001 From: Tim Murray Date: Tue, 20 Dec 2016 11:47:24 -0800 Subject: [PATCH] Fix incorrect FIFO cgroup assignment. bug 33745094 Test: builds Change-Id: I46eefc8ea6f17ca3795f4743692ddfea36d5db0f --- core/jni/android_util_Process.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp index 1cfbd97f82b91..b57f2362a2846 100644 --- a/core/jni/android_util_Process.cpp +++ b/core/jni/android_util_Process.cpp @@ -240,7 +240,7 @@ void android_os_Process_setProcessGroup(JNIEnv* env, jobject clazz, int pid, jin t_pri = getpriority(PRIO_PROCESS, t_pid); if (t_pri <= ANDROID_PRIORITY_AUDIO) { - int scheduler = sched_getscheduler(t_pid); + int scheduler = sched_getscheduler(t_pid) & ~SCHED_RESET_ON_FORK; if ((scheduler == SCHED_FIFO) || (scheduler == SCHED_RR)) { // This task wants to stay in its current audio group so it can keep its budget // don't update its cpuset or cgroup