Merge "Frameworks/base: Add no-thread marking to zygote am: 1ef8aef" into nyc-dev-plus-aosp (8d26f3c0) · Commits · e / os / android_frameworks_base

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

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