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

Revert "Treat allowlists differently for flattened apex"

Browse Source 
This reverts commit fd1c87c0a6.

Flattened apexes are no longer supported.

Bug: 278826656
Test: atest FrameworksServicesTests:SystemConfigTest
Change-Id: Ib983354fd25eaa65c2723557288810674c676ac5
This commit is contained in:
Jooyung Han
2023-07-07 11:03:22 +09:00
parent 6e68a96c10
commit 337e6cc832
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,6 @@ import android.os.VintfRuntimeInfo;
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;
@@ -1208,8 +1207,7 @@ public class SystemConfig {
boolean systemExt = permFile.toPath().startsWith(
Environment.getSystemExtDirectory().toPath() + "/");
boolean apex = permFile.toPath().startsWith(
Environment.getApexDirectory().toPath() + "/")
&& ApexProperties.updatable().orElse(false);
Environment.getApexDirectory().toPath() + "/");
if (vendor) {
readPrivAppPermissions(parser,
mPermissionAllowlist.getVendorPrivilegedAppAllowlist());