diff options
| author | Daniel Norman <danielnorman@google.com> | 2021-08-30 20:23:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-30 20:23:07 +0000 |
| commit | 6636bcd4bb1af4aaca0f928acc551857fdcc07f7 (patch) | |
| tree | f9e2d1a82267d031080905704cb97fe5c9654c4b /core/java | |
| parent | 2a523dff8e2b7833080433d4cc473e2ee070f6d8 (diff) | |
| parent | 8521eb44b17450f1f9b96d6e869aeca5c2772297 (diff) | |
Merge "Allow APEXes permission XMLs to declare features." am: ada5fb65b5 am: 2b3dbdd95b am: d0c69c2298 am: fd9b35d4de am: 8521eb44b1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1810683
Change-Id: Ia938dc0d825cc786e47071aeca9af399b0533acc
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/server/SystemConfig.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/com/android/server/SystemConfig.java b/core/java/com/android/server/SystemConfig.java index 6cbace4c65ba..b0cf5dcbbfd5 100644 --- a/core/java/com/android/server/SystemConfig.java +++ b/core/java/com/android/server/SystemConfig.java @@ -573,13 +573,14 @@ public class SystemConfig { if (!isSystemProcess()) { 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? for (File f: FileUtils.listFilesOrEmpty(Environment.getApexDirectory())) { if (f.isFile() || f.getPath().contains("@")) { continue; } - readPermissions(Environment.buildPath(f, "etc", "permissions"), ALLOW_LIBS); + readPermissions(Environment.buildPath(f, "etc", "permissions"), apexPermissionFlag); } } |