summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Victor Hsieh <victorhsieh@google.com> 2023-12-08 19:29:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-12-08 19:29:50 +0000
commit0afab341524873957b5f8f4ffb8773bc374dd47c (patch)
tree738cf1e398046968e36ee0cb7fc17207b573b5fd
parent2d0888c85868efe08febb808994a325486f4894e (diff)
parent2f005a180631fe66e5ec321638a05f4887a967b2 (diff)
Merge "Sync core/java/android/security/flags.aconfig to AOSP" into main am: 2f005a1806
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2865027 Change-Id: Ibb27eba0c4ddc6676f0683e00b59357b7882fb22 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/security/flags.aconfig22
1 files changed, 22 insertions, 0 deletions
diff --git a/core/java/android/security/flags.aconfig b/core/java/android/security/flags.aconfig
index 13612f60bf4b..28ef70b14026 100644
--- a/core/java/android/security/flags.aconfig
+++ b/core/java/android/security/flags.aconfig
@@ -21,3 +21,25 @@ flag {
bug: "296464083"
is_fixed_read_only: true
}
+
+flag {
+ name: "deprecate_fsv_sig"
+ namespace: "hardware_backed_security"
+ description: "Feature flag for deprecating .fsv_sig"
+ bug: "277916185"
+}
+
+flag {
+ name: "extend_vb_chain_to_updated_apk"
+ namespace: "hardware_backed_security"
+ description: "Use v4 signature and fs-verity to chain verification of allowlisted APKs to Verified Boot"
+ bug: "277916185"
+ is_fixed_read_only: true
+}
+
+flag {
+ name: "binary_transparency_sepolicy_hash"
+ namespace: "hardware_backed_security"
+ description: "Collect sepolicy hash from sysfs"
+ bug: "308471499"
+}