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

Commit c568c0d7 authored by Andrei-Valentin Onea's avatar Andrei-Valentin Onea Committed by Android (Google) Code Review
Browse files

Merge "Treat allowlists differently for flattened apex" into tm-dev

parents 1892bc12 fd1c87c0

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

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

import android.os.incremental.IncrementalManager;

import android.os.storage.StorageManager;

import android.os.storage.StorageManager;

import android.permission.PermissionManager.SplitPermissionInfo;

import android.permission.PermissionManager.SplitPermissionInfo;

import android.sysprop.ApexProperties;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.ArrayMap;

import android.util.ArraySet;

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

                            boolean systemExt = permFile.toPath().startsWith(

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

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

                            boolean apex = permFile.toPath().startsWith(

                            boolean apex = permFile.toPath().startsWith(

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

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

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

                            if (vendor) {

                            if (vendor) {

                                readPrivAppPermissions(parser, mVendorPrivAppPermissions,

                                readPrivAppPermissions(parser, mVendorPrivAppPermissions,

                                        mVendorPrivAppDenyPermissions);

                                        mVendorPrivAppDenyPermissions);