commit 0f30f984e8efb3b907d801cf62b855e6323b83ba
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 25 21:41:46 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 25 21:41:46 2020 +0000
tree f15dcacd90ba302575d8ef04239f080cc02315b7
parent 220ed7063eddc77b1fa17a9792ba71358c3f9484
parent 353924555ed8dfdea437d7f5833573963e0755b4

Merge "Added identity credential key to keymaster tag set." am: 0f6a221b62 am: 353924555e

Change-Id: I8b9be13d5928f2a9221c08a5801b8a3b4f7f4fe0

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index 0b7bf8a..2fbfe46 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -164,6 +164,8 @@
                                                       included in attestation */
     KM_TAG_DEVICE_UNIQUE_ATTESTATION = KM_BOOL | 720,  /* Indicates StrongBox device-unique attestation
                                                           is requested. */
+    KM_TAG_IDENTITY_CREDENTIAL_KEY = KM_BOOL | 721, /* This is an identity credential key */
+
 
     /* 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. */