Merge "Merge "Pass MTE RuntimeFlags to AppZygote." am: 1db942e761 am:... (eac071de) · Commits · e / os / android_frameworks_base

core/java/android/os/AppZygote.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -45,6 +45,8 @@ public class AppZygote {
		// Last UID/GID of the range the AppZygote can setuid()/setgid() to
		private final int mZygoteUidGidMax;

		private final int mZygoteRuntimeFlags;

		private final Object mLock = new Object();

		/**
		@@ -56,11 +58,13 @@ public class AppZygote {

		private final ApplicationInfo mAppInfo;

		public AppZygote(ApplicationInfo appInfo, int zygoteUid, int uidGidMin, int uidGidMax) {
		public AppZygote(ApplicationInfo appInfo, int zygoteUid, int uidGidMin, int uidGidMax,
		int runtimeFlags) {
		mAppInfo = appInfo;
		mZygoteUid = zygoteUid;
		mZygoteUidGidMin = uidGidMin;
		mZygoteUidGidMax = uidGidMax;
		mZygoteRuntimeFlags = runtimeFlags;
		}

		/**
		@@ -110,7 +114,7 @@ public class AppZygote {
		mZygoteUid,
		mZygoteUid,
		null, // gids
		0, // runtimeFlags
		mZygoteRuntimeFlags, // runtimeFlags
		"app_zygote", // seInfo
		abi, // abi
		abi, // acceptedAbiList

+2 −1

Original line number	Diff line number	Diff line
		@@ -2271,7 +2271,8 @@ public final class ProcessList {
		// not the calling one.
		appInfo.packageName = app.getHostingRecord().getDefiningPackageName();
		appInfo.uid = uid;
		appZygote = new AppZygote(appInfo, uid, firstUid, lastUid);
		int runtimeFlags = decideTaggingLevel(app);
		appZygote = new AppZygote(appInfo, uid, firstUid, lastUid, runtimeFlags);
		mAppZygotes.put(app.info.processName, uid, appZygote);
		zygoteProcessList = new ArrayList<ProcessRecord>();
		mAppZygoteProcesses.put(appZygote, zygoteProcessList);