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

Commit 94651571 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Treat allowlists differently for flattened apex"

parents 24fbdff6 ede686e3

core/java/com/android/server/SystemConfig.java

+3 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.os.Trace; 
import android.os.incremental.IncrementalManager;

import android.os.storage.StorageManager;

import android.permission.PermissionManager.SplitPermissionInfo;

import android.sysprop.ApexProperties;

import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.ArraySet;
@@ -1165,7 +1166,8 @@ public class SystemConfig { 
                            boolean systemExt = permFile.toPath().startsWith(

                                    Environment.getSystemExtDirectory().toPath() + "/");

                            boolean apex = permFile.toPath().startsWith(

                                    Environment.getApexDirectory().toPath() + "/");

                                    Environment.getApexDirectory().toPath() + "/")

                                    && ApexProperties.updatable().orElse(false);

                            if (vendor) {

                                readPrivAppPermissions(parser, mVendorPrivAppPermissions,

                                        mVendorPrivAppDenyPermissions);