| commit | d73dc82a5308533d8d7730df2cf0d69a8add7d26 | [log] [tgz] |
|---|---|---|
| author | Janis Danisevskis <jdanis@google.com> | Wed Apr 07 03:56:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 07 03:56:32 2021 +0000 |
| tree | 7747195a0a0a412a37724453c2708fac7afe4050 | |
| parent | 64e98c4f25b250ecb251f7441baf92af86c7b846 [diff] | |
| parent | a9827dcd26cf962d8081f551a0c39c81bf20a581 [diff] |
Merge "KeyMaster 4.0: Add missing tags to support library." am: 1b45e0c5c1 am: a9827dcd26 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1666159 Change-Id: I8fc6e6dfe3b35479434188fcef7f181894ff18de
diff --git a/keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h b/keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h index 8d6e74a..ea40971 100644 --- a/keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h +++ b/keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h
@@ -117,6 +117,9 @@ DECLARE_TYPED_TAG(ATTESTATION_ID_PRODUCT); DECLARE_TYPED_TAG(ATTESTATION_ID_MANUFACTURER); DECLARE_TYPED_TAG(ATTESTATION_ID_MODEL); +DECLARE_TYPED_TAG(ATTESTATION_ID_SERIAL); +DECLARE_TYPED_TAG(ATTESTATION_ID_IMEI); +DECLARE_TYPED_TAG(ATTESTATION_ID_MEID); DECLARE_TYPED_TAG(AUTH_TIMEOUT); DECLARE_TYPED_TAG(BLOB_USAGE_REQUIREMENTS); DECLARE_TYPED_TAG(BLOCK_MODE);