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

Merge "Added system_server to system group" into oc-mr1-dev

Browse Source 
am: 22d055566a

Change-Id: I0b6deacd471b2a6c082cb2cc916e8ee577045c9e
This commit is contained in:
Carmen Jackson
2017-08-30 01:07:24 +00:00
committed by android-build-merger
parent 185886f36b 22d055566a
commit e154c72e85
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -45,6 +45,8 @@
#include <unistd.h>
#include "android-base/logging.h"
#include <android-base/file.h>
#include <android-base/stringprintf.h>
#include <cutils/fs.h>
#include <cutils/multiuser.h>
#include <cutils/sched_policy.h>
@@ -65,6 +67,8 @@
namespace {
using android::String8;
using android::base::StringPrintf;
using android::base::WriteStringToFile;
static pid_t gSystemServerPid = 0;
@@ -770,6 +774,11 @@ static jint com_android_internal_os_Zygote_nativeForkSystemServer(
ALOGE("System server process %d has died. Restarting Zygote!", pid);
RuntimeAbort(env, __LINE__, "System server process has died. Restarting Zygote!");
}
// Assign system_server to the correct memory cgroup.
if (!WriteStringToFile(StringPrintf("%d", pid), "/dev/memcg/system/tasks")) {
ALOGE("couldn't write %d to /dev/memcg/system/tasks", pid);
}
}
return pid;
}