Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix incorrect FIFO cgroup assignment." am: d9ce420d9a

Browse Source 
am: a72f5f27d2

Change-Id: I172251111ab333e750bc862725a50b7913f20c90
This commit is contained in:
Tim Murray
2016-12-21 02:05:58 +00:00
committed by android-build-merger
parent 18d7a5e95f a72f5f27d2
commit 4dfe21d668
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android_util_Process.cpp
View File

@@ -240,7 +240,7 @@ void android_os_Process_setProcessGroup(JNIEnv* env, jobject clazz, int pid, jin
t_pri = getpriority(PRIO_PROCESS, t_pid); t_pri = getpriority(PRIO_PROCESS, t_pid);
if (t_pri <= ANDROID_PRIORITY_AUDIO) { 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)) { if ((scheduler == SCHED_FIFO) || (scheduler == SCHED_RR)) {
// This task wants to stay in its current audio group so it can keep its budget // This task wants to stay in its current audio group so it can keep its budget
// don't update its cpuset or cgroup // don't update its cpuset or cgroup