Merge "Updated Zygote IPC related comments."

core/java/android/os/ZygoteProcess.java

@@ -366,8 +366,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

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

@@ -731,17 +731,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 {

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

@@ -196,8 +196,17 @@ class ZygoteArguments {
      * Per security review bug #1112214, duplicate args are disallowed in critical cases to make
      * injection harder.
      */
-    private void parseArgs(String[] args)
+    private void parseArgs(String[] args) throws IllegalArgumentException {
-            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;