Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Treat allowlists differently for flattened apex"

Browse Source
This commit is contained in:
Treehugger Robot
2022-05-25 17:59:05 +00:00
committed by Gerrit Code Review
parent 24fbdff6a0 ede686e3a3
commit 94651571bc
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/server/SystemConfig.java
View File

@@ -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;
@@ -1165,7 +1166,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);