Merge "Mimic Zygote preload steps when using wrappers." (b375d3c7) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -54,6 +54,8 @@ public class WrapperInit {
	*/		*/
	public static void main(String[] args) {		public static void main(String[] args) {
	try {		try {
			// Tell the Zygote what our actual PID is (since it only knows about the
			// wrapper that it directly forked).
	int fdNum = Integer.parseInt(args[0], 10);		int fdNum = Integer.parseInt(args[0], 10);
	if (fdNum != 0) {		if (fdNum != 0) {
	try {		try {
	@@ -67,6 +69,10 @@ public class WrapperInit {
	}		}
	}		}

			// Mimic Zygote preloading.
			ZygoteInit.preload();

			// Launch the application.
	String[] runtimeArgs = new String[args.length - 1];		String[] runtimeArgs = new String[args.length - 1];
	System.arraycopy(args, 1, runtimeArgs, 0, runtimeArgs.length);		System.arraycopy(args, 1, runtimeArgs, 0, runtimeArgs.length);
	RuntimeInit.wrapperInit(runtimeArgs);		RuntimeInit.wrapperInit(runtimeArgs);

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -228,6 +228,11 @@ public class ZygoteInit {
	}		}
	}		}

			static void preload() {
			preloadClasses();
			preloadResources();
			}

	/**		/**
	* Performs Zygote process initialization. Loads and initializes		* Performs Zygote process initialization. Loads and initializes
	* commonly used classes.		* commonly used classes.
	@@ -509,8 +514,7 @@ public class ZygoteInit {
	registerZygoteSocket();		registerZygoteSocket();
	EventLog.writeEvent(LOG_BOOT_PROGRESS_PRELOAD_START,		EventLog.writeEvent(LOG_BOOT_PROGRESS_PRELOAD_START,
	SystemClock.uptimeMillis());		SystemClock.uptimeMillis());
	preloadClasses();		preload();
	preloadResources();
	EventLog.writeEvent(LOG_BOOT_PROGRESS_PRELOAD_END,		EventLog.writeEvent(LOG_BOOT_PROGRESS_PRELOAD_END,
	SystemClock.uptimeMillis());		SystemClock.uptimeMillis());