diff options
| author | 2024-10-08 22:52:00 +0000 | |
|---|---|---|
| committer | 2024-10-08 22:52:00 +0000 | |
| commit | eddc4e988f2ebf4872171d3ea50607dc2039dbbd (patch) | |
| tree | 595fd1071485750ee249bb83bd5490bc57735ffb | |
| parent | 31337485f3d447978d860aa60b54ea5f59354bfb (diff) | |
| parent | 2c1bc40dd5aacac4e4251c0b683a7fb254cd788a (diff) | |
Merge "Unflag apex_signature_permission_allowlist_enabled" into main
| -rw-r--r-- | core/java/android/permission/flags.aconfig | 11 | ||||
| -rw-r--r-- | services/core/java/com/android/server/SystemConfig.java | 6 |
2 files changed, 2 insertions, 15 deletions
diff --git a/core/java/android/permission/flags.aconfig b/core/java/android/permission/flags.aconfig index bca5bcc99c7e..feeb339c1200 100644 --- a/core/java/android/permission/flags.aconfig +++ b/core/java/android/permission/flags.aconfig @@ -206,17 +206,6 @@ flag { } 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" description: "Validate package/uid match in checkOp similar to noteOp" diff --git a/services/core/java/com/android/server/SystemConfig.java b/services/core/java/com/android/server/SystemConfig.java index d80e40c5898a..504137a29977 100644 --- a/services/core/java/com/android/server/SystemConfig.java +++ b/services/core/java/com/android/server/SystemConfig.java @@ -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("@")) { |