summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2023-10-23 17:20:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-23 17:20:23 +0000
commit82f913daca37a3313d5d0b511069bd9b88ea70fe (patch)
tree7f0c002ac494ff789e7843ea72b6494e4781ecdd
parentd3aaebe3bc2c8ab9d2c3e6f2d0b81933afb5e1fe (diff)
parent826c442fcf11f208ee6bb09a75437dff5f04f031 (diff)
Merge "Make fix_unlocked_device_required_keys a build-time flag" into main am: 826c442fcf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2798386 Change-Id: I103d5461decf895434bfe47015e33403859af657 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/security/flags.aconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/security/flags.aconfig b/core/java/android/security/flags.aconfig
index b6c2b83f0daa..5aa309753cc4 100644
--- a/core/java/android/security/flags.aconfig
+++ b/core/java/android/security/flags.aconfig
@@ -12,4 +12,5 @@ flag {
namespace: "hardware_backed_security"
description: "Fix bugs in behavior of UnlockedDeviceRequired keystore keys"
bug: "296464083"
+ is_fixed_read_only: true
}