Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55807140 authored by Evgenii Stepanov's avatar Evgenii Stepanov Committed by Automerger Merge Worker
Browse files

Merge "Pass MTE RuntimeFlags to AppZygote." am: 1db942e7 am: 7842e7f3 am:... 

Merge "Pass MTE RuntimeFlags to AppZygote." am: 1db942e7 am: 7842e7f3 am: 9399b998 am: 643beefb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910277

Change-Id: Ib7a87adb6df9071e3a281a8b7377dd1b4695244c
parents cf37df74 643beefb

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

services/core/java/com/android/server/am/ProcessList.java

+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);