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

Commit 2b3dbdd9 authored by Daniel Norman's avatar Daniel Norman Committed by Automerger Merge Worker
Browse files

Merge "Allow APEXes permission XMLs to declare features." am: ada5fb65 

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

Change-Id: I2385e0b45e15f204382ec5eeee24ce3d62b17064
parents 2f553cb4 ada5fb65

core/java/com/android/server/SystemConfig.java

+3 −2
Original line number Diff line number Diff line
@@ -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);

        }

    }