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

Pass runtimeFlags to postForkSystemServer

Browse Source 
Flags are now required by ART.

Bug: 139883463
Bug: 144383344
Test: showmap `pid system_server` and verify
Test: atest BootImageProfileTest
Change-Id: I9416ef888557bf0bc0ec7c83f7af1979cac351f8
This commit is contained in:
Mathieu Chartier
2019-11-21 14:30:03 -08:00
parent c518a2fe52
commit 2cb0a4d860
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/os/Zygote.java
View File

@@ -956,9 +956,9 @@ public final class Zygote {
// This function is called from native code in com_android_internal_os_Zygote.cpp
@SuppressWarnings("unused")
private static void callPostForkSystemServerHooks() {
private static void callPostForkSystemServerHooks(int runtimeFlags) {
// SystemServer specific post fork hooks run before child post fork hooks.
ZygoteHooks.postForkSystemServer();
ZygoteHooks.postForkSystemServer(runtimeFlags);
}
// This function is called from native code in com_android_internal_os_Zygote.cpp

4
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -1156,7 +1156,7 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids,
UnsetChldSignalHandler();
if (is_system_server) {
env->CallStaticVoidMethod(gZygoteClass, gCallPostForkSystemServerHooks);
env->CallStaticVoidMethod(gZygoteClass, gCallPostForkSystemServerHooks, runtime_flags);
if (env->ExceptionCheck()) {
fail_fn("Error calling post fork system server hooks.");
}
@@ -1802,7 +1802,7 @@ int register_com_android_internal_os_Zygote(JNIEnv* env) {
gZygoteClass = MakeGlobalRefOrDie(env, FindClassOrDie(env, kZygoteClassName));
gCallPostForkSystemServerHooks = GetStaticMethodIDOrDie(env, gZygoteClass,
"callPostForkSystemServerHooks",
"()V");
"(I)V");
gCallPostForkChildHooks = GetStaticMethodIDOrDie(env, gZygoteClass, "callPostForkChildHooks",
"(IZZLjava/lang/String;)V");