diff options
| author | 2023-09-24 17:27:20 +0000 | |
|---|---|---|
| committer | 2023-09-24 17:27:20 +0000 | |
| commit | 1ff74cb33e8824d24c3a1fcaec08e0dd003c5c1f (patch) | |
| tree | 3e2e15dafb7e9810e83d535a3680378e62acc245 | |
| parent | 71830f91d3e421f1ffaf57ba1aea815d5817ecb2 (diff) | |
| parent | 187d02a3e88f430f618ce3f523e1e9758d9b2be1 (diff) | |
Merge "Add aconfig for biometrics flags" into main am: 9cb671cd46 am: bbbfcfa719 am: 7563b24288 am: 187d02a3e8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2760588
Change-Id: Idb87b129baee504a95c50e6c87addcb07766f857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | AconfigFlags.bp | 14 | ||||
| -rw-r--r-- | core/java/android/hardware/biometrics/flags.aconfig | 8 |
2 files changed, 22 insertions, 0 deletions
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" +} |