Merge cherrypicks of [2879627, 2879649, 2879442, 2880524, 2879650] into oc-mr1-release (248c864f) · Commits · e / os / android_frameworks_base

core/java/android/os/Process.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -19,8 +19,8 @@ package android.os;
		import android.annotation.TestApi;
		import android.system.Os;
		import android.system.OsConstants;
		import android.util.Log;
		import android.webkit.WebViewZygote;

		import dalvik.system.VMRuntime;

		/**
		@@ -423,7 +423,7 @@ public class Process {
		*
		* When invokeWith is not null, the process will be started as a fresh app
		* and not a zygote fork. Note that this is only allowed for uid 0 or when
		* debugFlags contains DEBUG_ENABLE_DEBUGGER.
		* artFlags contains DEBUG_ENABLE_DEBUGGER.
		*
		* @param processClass The class to use as the process's main entry
		* point.
		@@ -431,7 +431,7 @@ public class Process {
		* @param uid The user-id under which the process will run.
		* @param gid The group-id under which the process will run.
		* @param gids Additional group-ids associated with the process.
		* @param debugFlags Additional flags.
		* @param artFlags Additional flags.
		* @param targetSdkVersion The target SDK version for the app.
		* @param seInfo null-ok SELinux information for the new process.
		* @param abi non-null the ABI this app should be started with.
		@@ -448,7 +448,7 @@ public class Process {
		public static final ProcessStartResult start(final String processClass,
		final String niceName,
		int uid, int gid, int[] gids,
		int debugFlags, int mountExternal,
		int artFlags, int mountExternal,
		int targetSdkVersion,
		String seInfo,
		String abi,
		@@ -457,7 +457,7 @@ public class Process {
		String invokeWith,
		String[] zygoteArgs) {
		return zygoteProcess.start(processClass, niceName, uid, gid, gids,
		debugFlags, mountExternal, targetSdkVersion, seInfo,
		artFlags, mountExternal, targetSdkVersion, seInfo,
		abi, instructionSet, appDataDir, invokeWith, zygoteArgs);
		}

		@@ -465,7 +465,7 @@ public class Process {
		public static final ProcessStartResult startWebView(final String processClass,
		final String niceName,
		int uid, int gid, int[] gids,
		int debugFlags, int mountExternal,
		int artFlags, int mountExternal,
		int targetSdkVersion,
		String seInfo,
		String abi,
		@@ -474,7 +474,7 @@ public class Process {
		String invokeWith,
		String[] zygoteArgs) {
		return WebViewZygote.getProcess().start(processClass, niceName, uid, gid, gids,
		debugFlags, mountExternal, targetSdkVersion, seInfo,
		artFlags, mountExternal, targetSdkVersion, seInfo,
		abi, instructionSet, appDataDir, invokeWith, zygoteArgs);
		}

core/java/android/os/ZygoteProcess.java

+9 −33

Original line number	Diff line number	Diff line
		@@ -20,9 +20,11 @@ import android.net.LocalSocket;
		import android.net.LocalSocketAddress;
		import android.util.Log;
		import android.util.Slog;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.os.Zygote;
		import com.android.internal.util.Preconditions;

		import java.io.BufferedWriter;
		import java.io.DataInputStream;
		import java.io.IOException;
		@@ -173,7 +175,7 @@ public class ZygoteProcess {
		*
		* When invokeWith is not null, the process will be started as a fresh app
		* and not a zygote fork. Note that this is only allowed for uid 0 or when
		* debugFlags contains DEBUG_ENABLE_DEBUGGER.
		* artFlags contains DEBUG_ENABLE_DEBUGGER.
		*
		* @param processClass The class to use as the process's main entry
		* point.
		@@ -181,7 +183,7 @@ public class ZygoteProcess {
		* @param uid The user-id under which the process will run.
		* @param gid The group-id under which the process will run.
		* @param gids Additional group-ids associated with the process.
		* @param debugFlags Additional flags.
		* @param artFlags Additional flags.
		* @param targetSdkVersion The target SDK version for the app.
		* @param seInfo null-ok SELinux information for the new process.
		* @param abi non-null the ABI this app should be started with.
		@@ -196,7 +198,7 @@ public class ZygoteProcess {
		public final Process.ProcessStartResult start(final String processClass,
		final String niceName,
		int uid, int gid, int[] gids,
		int debugFlags, int mountExternal,
		int artFlags, int mountExternal,
		int targetSdkVersion,
		String seInfo,
		String abi,
		@@ -206,7 +208,7 @@ public class ZygoteProcess {
		String[] zygoteArgs) {
		try {
		return startViaZygote(processClass, niceName, uid, gid, gids,
		debugFlags, mountExternal, targetSdkVersion, seInfo,
		artFlags, mountExternal, targetSdkVersion, seInfo,
		abi, instructionSet, appDataDir, invokeWith, zygoteArgs);
		} catch (ZygoteStartFailedEx ex) {
		Log.e(LOG_TAG,
		@@ -317,7 +319,7 @@ public class ZygoteProcess {
		* @param gid a POSIX gid that the new process shuold setgid() to
		* @param gids null-ok; a list of supplementary group IDs that the
		* new process should setgroup() to.
		* @param debugFlags Additional flags.
		* @param artFlags Additional flags.
		* @param targetSdkVersion The target SDK version for the app.
		* @param seInfo null-ok SELinux information for the new process.
		* @param abi the ABI the process should use.
		@@ -331,7 +333,7 @@ public class ZygoteProcess {
		final String niceName,
		final int uid, final int gid,
		final int[] gids,
		int debugFlags, int mountExternal,
		int artFlags, int mountExternal,
		int targetSdkVersion,
		String seInfo,
		String abi,
		@@ -347,33 +349,7 @@ public class ZygoteProcess {
		argsForZygote.add("--runtime-args");
		argsForZygote.add("--setuid=" + uid);
		argsForZygote.add("--setgid=" + gid);
		if ((debugFlags & Zygote.DEBUG_ENABLE_JNI_LOGGING) != 0) {
		argsForZygote.add("--enable-jni-logging");
		}
		if ((debugFlags & Zygote.DEBUG_ENABLE_SAFEMODE) != 0) {
		argsForZygote.add("--enable-safemode");
		}
		if ((debugFlags & Zygote.DEBUG_ENABLE_JDWP) != 0) {
		argsForZygote.add("--enable-jdwp");
		}
		if ((debugFlags & Zygote.DEBUG_ENABLE_CHECKJNI) != 0) {
		argsForZygote.add("--enable-checkjni");
		}
		if ((debugFlags & Zygote.DEBUG_GENERATE_DEBUG_INFO) != 0) {
		argsForZygote.add("--generate-debug-info");
		}
		if ((debugFlags & Zygote.DEBUG_ALWAYS_JIT) != 0) {
		argsForZygote.add("--always-jit");
		}
		if ((debugFlags & Zygote.DEBUG_NATIVE_DEBUGGABLE) != 0) {
		argsForZygote.add("--native-debuggable");
		}
		if ((debugFlags & Zygote.DEBUG_JAVA_DEBUGGABLE) != 0) {
		argsForZygote.add("--java-debuggable");
		}
		if ((debugFlags & Zygote.DEBUG_ENABLE_ASSERT) != 0) {
		argsForZygote.add("--enable-assert");
		}
		argsForZygote.add("--art-flags=" + artFlags);
		if (mountExternal == Zygote.MOUNT_EXTERNAL_DEFAULT) {
		argsForZygote.add("--mount-external-default");
		} else if (mountExternal == Zygote.MOUNT_EXTERNAL_READ) {

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

+17 −13

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ import java.lang.reflect.Method;
		/** @hide */
		public final class Zygote {
		/*
		* Bit values for "debugFlags" argument. The definitions are duplicated
		* Bit values for "artFlags" argument. The definitions are duplicated
		* in the native code.
		*/

		@@ -50,6 +50,10 @@ public final class Zygote {
		public static final int DEBUG_NATIVE_DEBUGGABLE = 1 << 7;
		/** Make the code Java debuggable by turning off some optimizations. */
		public static final int DEBUG_JAVA_DEBUGGABLE = 1 << 8;
		/** Turn off the verifier. */
		public static final int DISABLE_VERIFIER = 1 << 9;
		/** Only use oat files located in /system. Otherwise use dex/jar/apk . */
		public static final int ONLY_USE_SYSTEM_OAT_FILES = 1 << 10;

		/** No external storage should be mounted. */
		public static final int MOUNT_EXTERNAL_NONE = 0;
		@@ -75,7 +79,7 @@ public final class Zygote {
		* fork()ing and and before spawning any threads.
		* @param gids null-ok; a list of UNIX gids that the new process should
		* setgroups() to after fork and before spawning any threads.
		* @param debugFlags bit flags that enable debugging features.
		* @param artFlags bit flags that enable ART features.
		* @param rlimits null-ok an array of rlimit tuples, with the second
		* dimension having a length of 3 and representing
		* (resource, rlim_cur, rlim_max). These are set via the posix
		@@ -96,18 +100,18 @@ public final class Zygote {
		* @return 0 if this is the child, pid of the child
		* if this is the parent, or -1 on error.
		*/
		public static int forkAndSpecialize(int uid, int gid, int[] gids, int debugFlags,
		public static int forkAndSpecialize(int uid, int gid, int[] gids, int artFlags,
		int[][] rlimits, int mountExternal, String seInfo, String niceName, int[] fdsToClose,
		int[] fdsToIgnore, String instructionSet, String appDataDir) {
		VM_HOOKS.preFork();
		// Resets nice priority for zygote process.
		resetNicePriority();
		int pid = nativeForkAndSpecialize(
		uid, gid, gids, debugFlags, rlimits, mountExternal, seInfo, niceName, fdsToClose,
		uid, gid, gids, artFlags, rlimits, mountExternal, seInfo, niceName, fdsToClose,
		fdsToIgnore, instructionSet, appDataDir);
		// Enable tracing as soon as possible for the child process.
		if (pid == 0) {
		Trace.setTracingEnabled(true, debugFlags);
		Trace.setTracingEnabled(true, artFlags);

		// Note that this event ends at the end of handleChildProc,
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "PostFork");
		@@ -116,7 +120,7 @@ public final class Zygote {
		return pid;
		}

		native private static int nativeForkAndSpecialize(int uid, int gid, int[] gids,int debugFlags,
		native private static int nativeForkAndSpecialize(int uid, int gid, int[] gids,int artFlags,
		int[][] rlimits, int mountExternal, String seInfo, String niceName, int[] fdsToClose,
		int[] fdsToIgnore, String instructionSet, String appDataDir);

		@@ -137,7 +141,7 @@ public final class Zygote {
		* fork()ing and and before spawning any threads.
		* @param gids null-ok; a list of UNIX gids that the new process should
		* setgroups() to after fork and before spawning any threads.
		* @param debugFlags bit flags that enable debugging features.
		* @param artFlags bit flags that enable ART features.
		* @param rlimits null-ok an array of rlimit tuples, with the second
		* dimension having a length of 3 and representing
		* (resource, rlim_cur, rlim_max). These are set via the posix
		@@ -148,22 +152,22 @@ public final class Zygote {
		* @return 0 if this is the child, pid of the child
		* if this is the parent, or -1 on error.
		*/
		public static int forkSystemServer(int uid, int gid, int[] gids, int debugFlags,
		public static int forkSystemServer(int uid, int gid, int[] gids, int artFlags,
		int[][] rlimits, long permittedCapabilities, long effectiveCapabilities) {
		VM_HOOKS.preFork();
		// Resets nice priority for zygote process.
		resetNicePriority();
		int pid = nativeForkSystemServer(
		uid, gid, gids, debugFlags, rlimits, permittedCapabilities, effectiveCapabilities);
		uid, gid, gids, artFlags, rlimits, permittedCapabilities, effectiveCapabilities);
		// Enable tracing as soon as we enter the system_server.
		if (pid == 0) {
		Trace.setTracingEnabled(true, debugFlags);
		Trace.setTracingEnabled(true, artFlags);
		}
		VM_HOOKS.postForkCommon();
		return pid;
		}

		native private static int nativeForkSystemServer(int uid, int gid, int[] gids, int debugFlags,
		native private static int nativeForkSystemServer(int uid, int gid, int[] gids, int artFlags,
		int[][] rlimits, long permittedCapabilities, long effectiveCapabilities);

		/**
		@@ -177,9 +181,9 @@ public final class Zygote {
		*/
		native protected static void nativeUnmountStorageOnInit();

		private static void callPostForkChildHooks(int debugFlags, boolean isSystemServer,
		private static void callPostForkChildHooks(int artFlags, boolean isSystemServer,
		String instructionSet) {
		VM_HOOKS.postForkChild(debugFlags, isSystemServer, instructionSet);
		VM_HOOKS.postForkChild(artFlags, isSystemServer, instructionSet);
		}

		/**

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

+10 −27

Original line number	Diff line number	Diff line
		@@ -220,9 +220,9 @@ class ZygoteConnection {
		fd = null;

		pid = Zygote.forkAndSpecialize(parsedArgs.uid, parsedArgs.gid, parsedArgs.gids,
		parsedArgs.debugFlags, rlimits, parsedArgs.mountExternal, parsedArgs.seInfo,
		parsedArgs.niceName, fdsToClose, fdsToIgnore, parsedArgs.instructionSet,
		parsedArgs.appDataDir);
		parsedArgs.artFlags, rlimits, parsedArgs.mountExternal, parsedArgs.seInfo,
		parsedArgs.niceName, fdsToClose, fdsToIgnore,
		parsedArgs.instructionSet, parsedArgs.appDataDir);

		try {
		if (pid == 0) {
		@@ -349,11 +349,9 @@ class ZygoteConnection {
		int[] gids;

		/**
		* From --enable-jdwp, --enable-checkjni, --enable-assert,
		* --enable-safemode, --generate-debug-info, --enable-jni-logging,
		* --java-debuggable, and --native-debuggable.
		* From --art-flags.
		*/
		int debugFlags;
		int artFlags;

		/** From --mount-external */
		int mountExternal = Zygote.MOUNT_EXTERNAL_NONE;
		@@ -469,26 +467,11 @@ class ZygoteConnection {
		targetSdkVersionSpecified = true;
		targetSdkVersion = Integer.parseInt(
		arg.substring(arg.indexOf('=') + 1));
		} else if (arg.equals("--enable-jdwp")) {
		debugFlags \|= Zygote.DEBUG_ENABLE_JDWP;
		} else if (arg.equals("--enable-safemode")) {
		debugFlags \|= Zygote.DEBUG_ENABLE_SAFEMODE;
		} else if (arg.equals("--enable-checkjni")) {
		debugFlags \|= Zygote.DEBUG_ENABLE_CHECKJNI;
		} else if (arg.equals("--generate-debug-info")) {
		debugFlags \|= Zygote.DEBUG_GENERATE_DEBUG_INFO;
		} else if (arg.equals("--always-jit")) {
		debugFlags \|= Zygote.DEBUG_ALWAYS_JIT;
		} else if (arg.equals("--native-debuggable")) {
		debugFlags \|= Zygote.DEBUG_NATIVE_DEBUGGABLE;
		} else if (arg.equals("--java-debuggable")) {
		debugFlags \|= Zygote.DEBUG_JAVA_DEBUGGABLE;
		} else if (arg.equals("--enable-jni-logging")) {
		debugFlags \|= Zygote.DEBUG_ENABLE_JNI_LOGGING;
		} else if (arg.equals("--enable-assert")) {
		debugFlags \|= Zygote.DEBUG_ENABLE_ASSERT;
		} else if (arg.equals("--runtime-args")) {
		seenRuntimeArgs = true;
		} else if (arg.startsWith("--art-flags=")) {
		artFlags = Integer.parseInt(
		arg.substring(arg.indexOf('=') + 1));
		} else if (arg.startsWith("--seinfo=")) {
		if (seInfoSpecified) {
		throw new IllegalArgumentException(
		@@ -704,7 +687,7 @@ class ZygoteConnection {
		*/
		public static void applyDebuggerSystemProperty(Arguments args) {
		if (RoSystemProperties.DEBUGGABLE) {
		args.debugFlags \|= Zygote.DEBUG_ENABLE_JDWP;
		args.artFlags \|= Zygote.DEBUG_ENABLE_JDWP;
		}
		}

		@@ -726,7 +709,7 @@ class ZygoteConnection {
		int peerUid = peer.getUid();

		if (args.invokeWith != null && peerUid != 0 &&
		(args.debugFlags & Zygote.DEBUG_ENABLE_JDWP) == 0) {
		(args.artFlags & Zygote.DEBUG_ENABLE_JDWP) == 0) {
		throw new ZygoteSecurityException("Peer is permitted to specify an"
		+ "explicit invoke-with wrapper command only for debuggable"
		+ "applications.");

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -660,7 +660,7 @@ public class ZygoteInit {
		pid = Zygote.forkSystemServer(
		parsedArgs.uid, parsedArgs.gid,
		parsedArgs.gids,
		parsedArgs.debugFlags,
		parsedArgs.artFlags,
		null,
		parsedArgs.permittedCapabilities,
		parsedArgs.effectiveCapabilities);