Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cb0a4d8 authored by Mathieu Chartier's avatar Mathieu Chartier
Browse files

Pass runtimeFlags to postForkSystemServer 

Flags are now required by ART.

Bug: 139883463
Bug: 144383344
Test: showmap `pid system_server` and verify
Test: atest BootImageProfileTest
Change-Id: I9416ef888557bf0bc0ec7c83f7af1979cac351f8
parent c518a2fe

core/java/com/android/internal/os/Zygote.java

+2 −2
Original line number Diff line number Diff line
@@ -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

core/jni/com_android_internal_os_Zygote.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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");