summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2019-01-09 01:08:14 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-01-09 01:08:14 +0000
commit2b4d64806cb46d6a11fe8f1ccb9a6e2df18cb435 (patch)
tree512210199e99d0054fd961ca0d585763ca00e5c8
parentbf1f16488d48634c5c9c6a9611ae1a409da53c93 (diff)
parentc74d2852f51391bd11dc8cb121890812d2bf77a4 (diff)
downloadandroid_system_keymaster-2b4d64806cb46d6a11fe8f1ccb9a6e2df18cb435.tar.gz
android_system_keymaster-2b4d64806cb46d6a11fe8f1ccb9a6e2df18cb435.tar.bz2
android_system_keymaster-2b4d64806cb46d6a11fe8f1ccb9a6e2df18cb435.zip
Merge "Add missing TAG definition TAG_UNLOCKED_DEVICE_REQUIRED"
-rw-r--r--android_keymaster/keymaster_tags.cpp1
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.