Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Pass MTE RuntimeFlags to AppZygote."

Browse Source
This commit is contained in:
Evgenii Stepanov
2021-12-07 19:03:17 +00:00
committed by Gerrit Code Review
parent 36a25527b4 8895ef1256
commit 1db942e761
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/os/AppZygote.java
View File

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

3
services/core/java/com/android/server/am/ProcessList.java
View File

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