commit 308d43a303fa8225f55d1f6b28698a240f79adff
author Eran Messeri <eranm@google.com> Mon Dec 05 17:39:32 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 05 17:39:32 2022 +0000
tree 7bef070efcf7c68e520f8d81b18af21a1c4e8d10
parent bc544c7d9aabd68d7a9a46d1afb314589dacb63f
parent 9e34eae550d8962e12cb91e9d51d583b4eb8751f

Merge "Add the second IMEI tag" am: 9e34eae550

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2295117

Change-Id: I5a0a6319de0c35e9b7e4688a5e70e263bb21272f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index 930aceb..dd286d6 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -175,6 +175,8 @@
                                                           attestation is requested. */
     KM_TAG_IDENTITY_CREDENTIAL_KEY = KM_BOOL | 721, /* This is an identity credential key */
     KM_TAG_STORAGE_KEY = KM_BOOL | 722,             /* storage encryption key */
+    KM_TAG_ATTESTATION_ID_SECOND_IMEI = KM_BYTES | 723,   /* Used to provide the device's second
+                                                             IMEI to be included in attestation */
 
     /* Tags used only to provide data to or receive data from operations */
     KM_TAG_ASSOCIATED_DATA = KM_BYTES | 1000, /* Used to provide associated data for AEAD modes. */