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

Commit b5411621 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by android-build-merger
Browse files

Merge "Pass runtimeFlags to postForkSystemServer" 

am: d9bcf564

Change-Id: Ib37dbd13b9b50c4aa072e90fa010320d0208207d
parents a575fdfc d9bcf564

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

+2 −2
Original line number Diff line number Diff line
@@ -891,9 +891,9 @@ public final class Zygote { 
        }

    }



    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);

    }



    private static void callPostForkChildHooks(int runtimeFlags, boolean isSystemServer,

core/jni/com_android_internal_os_Zygote.cpp

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

    }
@@ -1741,7 +1741,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");