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

Commit dd04a0cb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Treat allowlists differently for flattened apex" am: 94651571 

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



Change-Id: I26f0cf634a93d1f6fe14dbf3e1d96b27b0c70014
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 086cf4b5 94651571

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