summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2023-10-23 17:37:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-23 17:37:27 +0000
commitf16f3d4f0982b7b6a2e7654acf353460583fae10 (patch)
treebc2a50acf31868c943f0a3658b7c5a33fe5e4d7a
parenta9e51bcecc029456330d5e9e4abeb0ba98ff8ec0 (diff)
parent75ced70736f22bd8cf07b6bd45514c04bb4bda7f (diff)
Merge "Make fix_unlocked_device_required_keys a build-time flag" into main am: 826c442fcf am: 75ced70736
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2798386 Change-Id: I01f9f9b39b79fb9fdc91ceea6a10cbfa800ed204 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
}