From f732f47c9feada3a42d52434d104996289ce97a0 Mon Sep 17 00:00:00 2001
From: Shaquille Johnson <ssjohnson@google.com>
Date: Fri, 22 Sep 2023 23:00:59 +0100
Subject: [PATCH] Add aconfig for biometrics flags
Bug: 282058146
Test: Treehugger
Merged-In: Idd66455b28cc61e53c68f559244ad2d022cf65d3
Change-Id: Iaa956dec6c64220bcd3a83390b4a9811c42e518e
---
AconfigFlags.bp | 14 ++++++++++++++
.../java/android/hardware/biometrics/flags.aconfig | 8 ++++++++
2 files changed, 22 insertions(+)
create mode 100644 core/java/android/hardware/biometrics/flags.aconfig
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 8670b4db2a5a..341047dd1802 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -13,6 +13,7 @@
// limitations under the License.
aconfig_srcjars = [
+ ":android.hardware.biometrics.flags-aconfig-java{.generated_srcjars}",
":android.os.flags-aconfig-java{.generated_srcjars}",
":android.security.flags-aconfig-java{.generated_srcjars}",
":com.android.hardware.camera2-aconfig-java{.generated_srcjars}",
@@ -129,3 +130,16 @@ java_aconfig_library {
test: true,
defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
+
+// Biometrics
+aconfig_declarations {
+ name: "android.hardware.biometrics.flags-aconfig",
+ package: "android.hardware.biometrics",
+ srcs: ["core/java/android/hardware/biometrics/flags.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.hardware.biometrics.flags-aconfig-java",
+ aconfig_declarations: "android.hardware.biometrics.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
diff --git a/core/java/android/hardware/biometrics/flags.aconfig b/core/java/android/hardware/biometrics/flags.aconfig
new file mode 100644
index 000000000000..0924e0d12bd3
--- /dev/null
+++ b/core/java/android/hardware/biometrics/flags.aconfig
@@ -0,0 +1,8 @@
+package: "android.hardware.biometrics"
+
+flag {
+ name: "add_key_agreement_crypto_object"
+ namespace: "biometrics"
+ description: "Feature flag for adding KeyAgreement api to CryptoObject."
+ bug: "282058146"
+}
--
GitLab