| commit | 4035899e172e61594306ac1cc22fc09d4a525d7f | [log] [tgz] |
|---|---|---|
| author | Janis Danisevskis <jdanis@google.com> | Wed Apr 07 05:21:22 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 07 05:21:22 2021 +0000 |
| tree | 3c18ec74026249a4f9c026118dfea4ace538b8d8 | |
| parent | 81829f9d5ec7af086a0a0d4895da5c7ad81f4041 [diff] | |
| parent | 8b9e58720f231d098e1ce1bfa33526bf22488438 [diff] |
Merge "KeyMaster 4.0: Add missing tags to support library." am: 1b45e0c5c1 am: a9827dcd26 am: d73dc82a53 am: 8b9e58720f Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1666159 Change-Id: I20bc20045e7d05168e8cd512c33bd9ae49baef26
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);