summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2023-10-23 17:18:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-23 17:18:23 +0000
commit75ced70736f22bd8cf07b6bd45514c04bb4bda7f (patch)
treeecbc06b497a98c3a415397933b36c130a3602dbd
parentf1c2cd8e81362c85e395cc8c2e58ec7abed2a5c5 (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: I54d4fc48394930e1543cfd5999ad8852b05b14d2 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
}