| commit | a9827dcd26cf962d8081f551a0c39c81bf20a581 | [log] [tgz] |
|---|---|---|
| author | Janis Danisevskis <jdanis@google.com> | Wed Apr 07 03:06:23 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 07 03:06:23 2021 +0000 |
| tree | eeae6616bb717140021c39d19dde1ff1affc12e2 | |
| parent | 65e7f5e54e5be23291b194beee727068daeff97c [diff] | |
| parent | 1b45e0c5c1f856a68ac98b4e0cd6ad007efbf711 [diff] |
Merge "KeyMaster 4.0: Add missing tags to support library." am: 1b45e0c5c1 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1666159 Change-Id: Ieea68aa5c45048f1493b50fbbfc64f66fd006553
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);