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

Commit 643bc5ce authored by Evgenii Stepanov's avatar Evgenii Stepanov
Browse files

Revert "Pass MTE RuntimeFlags to AppZygote." 

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

This reverts commit 8895ef12.

Bug: 207557677
Test: CtsTaggingHostTestCases
Change-Id: I033ee79ce05db87586358ba954ecfcaf8aaa6249
parent 9c2d1e67

core/java/android/os/AppZygote.java

+2 −6
Original line number Diff line number Diff line
@@ -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

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

+1 −2
Original line number Diff line number Diff line
@@ -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);