summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-12-21 20:42:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-12-21 20:42:23 +0000
commitefea8228bd3b0cc6bb67624dfedf9dfce5fc55cc (patch)
tree198edb86139d6655ecf1fe01a8492fe5b0efbc3e
parentd8ba9c197a44227ed455a7ef2b0fb824aa6c1ea8 (diff)
parentdb8a5381679fceecbd6334eb615e274819e3ad51 (diff)
Merge "Create flag for FRP hardening feature" into main am: 9510c20d39 am: db8a538167
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2864954 Change-Id: I2c9414f1a5be1aec0b0096b9247fa82fde575705 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/security/flags.aconfig8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/security/flags.aconfig b/core/java/android/security/flags.aconfig
index b56bef3c93a0..30524a1132fa 100644
--- a/core/java/android/security/flags.aconfig
+++ b/core/java/android/security/flags.aconfig
@@ -50,3 +50,11 @@ flag {
description: "Collect sepolicy hash from sysfs"
bug: "308471499"
}
+
+flag {
+ name: "frp_enforcement"
+ namespace: "android_hw_security"
+ description: "This flag controls whether PDB enforces FRP"
+ bug: "290312729"
+ is_fixed_read_only: true
+}