diff options
| author | Evgenii Stepanov <eugenis@google.com> | 2021-12-07 19:56:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-07 19:56:14 +0000 |
| commit | 643beefbb97ec09e256141647bdb30911df1d725 (patch) | |
| tree | daf786a01fab7cc47946fbb6e42a10dcf203fc12 /core/java/android | |
| parent | 7428a74af746a87bf64a38c28f70010cce67a2d4 (diff) | |
| parent | 9399b9981d4bae658be19eb5f5e927e7b911c275 (diff) | |
Merge "Pass MTE RuntimeFlags to AppZygote." am: 1db942e761 am: 7842e7f363 am: 9399b9981d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910277
Change-Id: Ib57a9388139da44785a73253ea8c8769961db629
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/AppZygote.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/os/AppZygote.java b/core/java/android/os/AppZygote.java index 74b814ea4159..c8b4226ecae0 100644 --- a/core/java/android/os/AppZygote.java +++ b/core/java/android/os/AppZygote.java @@ -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 |