Merge "Updated Zygote IPC related comments." am: f8881b6821 am: c850654edc (a2f67c96) · Commits · e / os / android_frameworks_base

core/java/android/os/ZygoteProcess.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -398,8 +398,8 @@ public class ZygoteProcess {
		}
		}

		/**
		* See com.android.internal.os.SystemZygoteInit.readArgumentList()
		/*
		* See com.android.internal.os.ZygoteArguments.parseArgs()
		* Presently the wire format to the zygote process is:
		* a) a count of arguments (argc, in essence)
		* b) a number of newline-separated argument strings equal to count

+0 −11

Original line number	Diff line number	Diff line
		@@ -767,17 +767,6 @@ public final class Zygote {
		* @throws IOException passed straight through
		*/
		static String[] readArgumentList(BufferedReader socketReader) throws IOException {

		/**
		* See android.os.Process.zygoteSendArgsAndGetPid()
		* Presently the wire format to the zygote process is:
		* a) a count of arguments (argc, in essence)
		* b) a number of newline-separated argument strings equal to count
		*
		* After the zygote process reads these it will write the pid of
		* the child or -1 on failure.
		*/

		int argc;

		try {

+11 −2

Original line number	Diff line number	Diff line
		@@ -217,8 +217,17 @@ class ZygoteArguments {
		* Per security review bug #1112214, duplicate args are disallowed in critical cases to make
		* injection harder.
		*/
		private void parseArgs(String[] args)
		throws IllegalArgumentException {
		private void parseArgs(String[] args) throws IllegalArgumentException {
		/*
		* See android.os.ZygoteProcess.zygoteSendArgsAndGetResult()
		* Presently the wire format to the zygote process is:
		* a) a count of arguments (argc, in essence)
		* b) a number of newline-separated argument strings equal to count
		*
		* After the zygote process reads these it will write the pid of
		* the child or -1 on failure.
		*/

		int curArg = 0;

		boolean seenRuntimeArgs = false;