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

Commit 0c322abb authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Frameworks/base: Add no-thread marking to zygote

am: 1ef8aef2

* commit '1ef8aef2':
  Frameworks/base: Add no-thread marking to zygote

Change-Id: I8ac948e3c107324ce18e44bdff74fce1bd97fc6c
parents d604555e 1ef8aef2
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import com.android.internal.os.InstallerConnection.InstallerException;
import dalvik.system.DexFile;
import dalvik.system.PathClassLoader;
import dalvik.system.VMRuntime;
import dalvik.system.ZygoteHooks;

import libcore.io.IoUtils;

@@ -597,6 +598,10 @@ public class ZygoteInit {
    }

    public static void main(String argv[]) {
        // Mark zygote start. This ensures that thread creation will throw
        // an error.
        ZygoteHooks.startZygoteNoThreadCreation();

        try {
            Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "ZygoteInit");
            RuntimeInit.enableDdms();
@@ -648,6 +653,8 @@ public class ZygoteInit {
            // Zygote process unmounts root storage spaces.
            Zygote.nativeUnmountStorageOnInit();

            ZygoteHooks.stopZygoteNoThreadCreation();

            if (startSystemServer) {
                startSystemServer(abiList, socketName);
            }