summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ellen Arteca <emarteca@google.com> 2024-04-26 17:38:31 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-26 17:38:31 +0000
commit91d3115bea3bc882d995f0088d3b4d4569b6aeb5 (patch)
tree0145b12bd475acdf2d0794d857996f50fbd13cf1
parente46782f6f7934a9ef9ede2c6160faf1e8acc63fe (diff)
parent296079cc12912061f0281b67999de02b7d99e57b (diff)
Merge "Add API flag for storage area API" into main am: 296079cc12
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3016379 Change-Id: Iafc6f5e708cae530859464be97139f269f8afdfa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/security/flags.aconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/security/flags.aconfig b/core/java/android/security/flags.aconfig
index 3c77c44fb3f0..6aa956bcdcdd 100644
--- a/core/java/android/security/flags.aconfig
+++ b/core/java/android/security/flags.aconfig
@@ -41,6 +41,13 @@ flag {
}
flag {
+ name: "unlocked_storage_api"
+ namespace: "hardware_backed_security"
+ description: "Feature flag for unlocked-only storage API"
+ bug: "325129836"
+}
+
+flag {
name: "deprecate_fsv_sig"
namespace: "hardware_backed_security"
description: "Feature flag for deprecating .fsv_sig"