diff options
| author | Janis Danisevskis <jdanis@google.com> | 2019-01-08 17:21:56 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-08 17:21:56 -0800 |
| commit | e7f05c6fb980a9574954bdc73d5fa89328f2dd12 (patch) | |
| tree | 512210199e99d0054fd961ca0d585763ca00e5c8 | |
| parent | 1f6ad22ce4414a38a187307feb312d934db5acf5 (diff) | |
| parent | 2b4d64806cb46d6a11fe8f1ccb9a6e2df18cb435 (diff) | |
| download | android_system_keymaster-e7f05c6fb980a9574954bdc73d5fa89328f2dd12.tar.gz android_system_keymaster-e7f05c6fb980a9574954bdc73d5fa89328f2dd12.tar.bz2 android_system_keymaster-e7f05c6fb980a9574954bdc73d5fa89328f2dd12.zip | |
Merge "Add missing TAG definition TAG_UNLOCKED_DEVICE_REQUIRED"
am: 2b4d64806c
Change-Id: Id626d4b3be5ec1c13bc7ea4c223f0c912bdb9a3f
| -rw-r--r-- | android_keymaster/keymaster_tags.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/android_keymaster/keymaster_tags.cpp b/android_keymaster/keymaster_tags.cpp index 27b67c8..7ee3728 100644 --- a/android_keymaster/keymaster_tags.cpp +++ b/android_keymaster/keymaster_tags.cpp @@ -180,6 +180,7 @@ DEFINE_KEYMASTER_TAG(KM_BYTES, TAG_ATTESTATION_ID_IMEI); DEFINE_KEYMASTER_TAG(KM_BYTES, TAG_ATTESTATION_ID_MEID); DEFINE_KEYMASTER_TAG(KM_BYTES, TAG_ATTESTATION_ID_MANUFACTURER); DEFINE_KEYMASTER_TAG(KM_BYTES, TAG_ATTESTATION_ID_MODEL); +DEFINE_KEYMASTER_TAG(KM_BOOL, TAG_UNLOCKED_DEVICE_REQUIRED); // DEFINE_KEYMASTER_ENUM_TAG is used to create TypedEnumTag instances for each enum keymaster tag. |