resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 (d610363a) · Commits · e / os / android_frameworks_base

core/java/android/os/Process.java

+15 −6

Original line number	Diff line number	Diff line
		@@ -538,6 +538,15 @@ public class Process {
		ZygoteState zygoteState, ArrayList<String> args)
		throws ZygoteStartFailedEx {
		try {
		// Throw early if any of the arguments are malformed. This means we can
		// avoid writing a partial response to the zygote.
		int sz = args.size();
		for (int i = 0; i < sz; i++) {
		if (args.get(i).indexOf('\n') >= 0) {
		throw new ZygoteStartFailedEx("embedded newlines not allowed");
		}
		}

		/**
		* See com.android.internal.os.ZygoteInit.readArgumentList()
		* Presently the wire format to the zygote process is:
		@@ -554,13 +563,8 @@ public class Process {
		writer.write(Integer.toString(args.size()));
		writer.newLine();

		int sz = args.size();
		for (int i = 0; i < sz; i++) {
		String arg = args.get(i);
		if (arg.indexOf('\n') >= 0) {
		throw new ZygoteStartFailedEx(
		"embedded newlines not allowed");
		}
		writer.write(arg);
		writer.newLine();
		}
		@@ -569,11 +573,16 @@ public class Process {

		// Should there be a timeout on this?
		ProcessStartResult result = new ProcessStartResult();

		// Always read the entire result from the input stream to avoid leaving
		// bytes in the stream for future process starts to accidentally stumble
		// upon.
		result.pid = inputStream.readInt();
		result.usingWrapper = inputStream.readBoolean();

		if (result.pid < 0) {
		throw new ZygoteStartFailedEx("fork() failed");
		}
		result.usingWrapper = inputStream.readBoolean();
		return result;
		} catch (IOException ex) {
		zygoteState.close();