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

Commit eddc4e98 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Unflag apex_signature_permission_allowlist_enabled" into main

parents 31337485 2c1bc40d

core/java/android/permission/flags.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -205,17 +205,6 @@ flag { 
    bug: "308201969"

}



flag {

    name: "apex_signature_permission_allowlist_enabled"

    is_fixed_read_only: true

    namespace: "permissions"

    description: "Enable reading signature permission allowlist from APEXes"

    bug: "308573169"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "check_op_validate_package"

    namespace: "permissions"

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

+2 −4
Original line number Diff line number Diff line
@@ -727,10 +727,8 @@ public class SystemConfig { 
            return;

        }

        // Read configuration of features, libs and priv-app permissions from apex module.

        int apexPermissionFlag = ALLOW_LIBS | ALLOW_FEATURES | ALLOW_PRIVAPP_PERMISSIONS;

        if (android.permission.flags.Flags.apexSignaturePermissionAllowlistEnabled()) {

            apexPermissionFlag |= ALLOW_SIGNATURE_PERMISSIONS;

        }

        int apexPermissionFlag = ALLOW_LIBS | ALLOW_FEATURES | ALLOW_PRIVAPP_PERMISSIONS

                | ALLOW_SIGNATURE_PERMISSIONS;

        // TODO: Use a solid way to filter apex module folders?

        for (File f: FileUtils.listFilesOrEmpty(Environment.getApexDirectory())) {

            if (f.isFile() || f.getPath().contains("@")) {