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

Merge "Allow APEXes permission XMLs to declare features." am: ada5fb65b5 am: 2b3dbdd95b

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

Change-Id: I1f429e9506dc522cc29d3b4ecba8b33d6982eb55
This commit is contained in:
Daniel Norman
2021-08-30 19:32:25 +00:00
committed by Automerger Merge Worker
parent 7e37574997 2b3dbdd95b
commit d0c69c2298
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -573,13 +573,14 @@ public class SystemConfig {
if (!isSystemProcess()) { if (!isSystemProcess()) {
return; return;
} }
// Read configuration of libs from apex module. // Read configuration of features and libs from apex module.
int apexPermissionFlag = ALLOW_LIBS | ALLOW_FEATURES;
// TODO: Use a solid way to filter apex module folders? // TODO: Use a solid way to filter apex module folders?
for (File f: FileUtils.listFilesOrEmpty(Environment.getApexDirectory())) { for (File f: FileUtils.listFilesOrEmpty(Environment.getApexDirectory())) {
if (f.isFile() || f.getPath().contains("@")) { if (f.isFile() || f.getPath().contains("@")) {
continue; continue;
} }
readPermissions(Environment.buildPath(f, "etc", "permissions"), ALLOW_LIBS); readPermissions(Environment.buildPath(f, "etc", "permissions"), apexPermissionFlag);
} }
} }