Merge "Add post fork hook for System Server" am: f2a342b3ab am: a58c2a07c1

am: 4bff3b4fb6 Change-Id: Ia97204dbf4aeaa97d08601aab6bd761cd5cfcea3
2018-10-31 08:19:45 -07:00
parent 316902da9b 4bff3b4fb6
commit 1bd83da389
2 changed files with 21 additions and 0 deletions
--- a/core/java/com/android/internal/os/Zygote.java
+++ b/core/java/com/android/internal/os/Zygote.java
@@ -216,6 +216,11 @@ public final class Zygote {
     */
    native protected static void nativeUnmountStorageOnInit();

+    private static void callPostForkSystemServerHooks() {
+        // SystemServer specific post fork hooks run before child post fork hooks.
+        VM_HOOKS.postForkSystemServer();
+    }
+
    private static void callPostForkChildHooks(int runtimeFlags, boolean isSystemServer,
            boolean isZygote, String instructionSet) {
        VM_HOOKS.postForkChild(runtimeFlags, isSystemServer, isZygote, instructionSet);