Revert "Pass MTE RuntimeFlags to AppZygote."

The change affects non-MTE devices, contrary to the claims in the
description.

This reverts commit 8895ef1256.

Bug: 207557677
Test: CtsTaggingHostTestCases
Change-Id: I033ee79ce05db87586358ba954ecfcaf8aaa6249
This commit is contained in:
Evgenii Stepanov
2021-12-08 16:40:32 -08:00
parent 9c2d1e673f
commit 643bc5ce5e
2 changed files with 3 additions and 8 deletions

View File

@@ -45,8 +45,6 @@ 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();
/**
@@ -58,13 +56,11 @@ public class AppZygote {
private final ApplicationInfo mAppInfo;
public AppZygote(ApplicationInfo appInfo, int zygoteUid, int uidGidMin, int uidGidMax,
int runtimeFlags) {
public AppZygote(ApplicationInfo appInfo, int zygoteUid, int uidGidMin, int uidGidMax) {
mAppInfo = appInfo;
mZygoteUid = zygoteUid;
mZygoteUidGidMin = uidGidMin;
mZygoteUidGidMax = uidGidMax;
mZygoteRuntimeFlags = runtimeFlags;
}
/**
@@ -114,7 +110,7 @@ public class AppZygote {
mZygoteUid,
mZygoteUid,
null, // gids
mZygoteRuntimeFlags, // runtimeFlags
0, // runtimeFlags
"app_zygote", // seInfo
abi, // abi
abi, // acceptedAbiList

View File

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