diff options
| author | Janis Danisevskis <jdanis@google.com> | 2019-01-08 17:34:13 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-08 17:34:13 -0800 |
| commit | e4cc153a781274d472dd9309a8934e92e6b8c4ae (patch) | |
| tree | 512210199e99d0054fd961ca0d585763ca00e5c8 | |
| parent | 3f4cdcd166f381ec53b9e340fe3e0d8dfe8b5ee0 (diff) | |
| parent | 1d336a9fccd8d7af8e46db4a0ccf30d76644f9cb (diff) | |
| download | android_system_keymaster-e4cc153a781274d472dd9309a8934e92e6b8c4ae.tar.gz android_system_keymaster-e4cc153a781274d472dd9309a8934e92e6b8c4ae.tar.bz2 android_system_keymaster-e4cc153a781274d472dd9309a8934e92e6b8c4ae.zip | |
Merge "Add missing TAG definition TAG_UNLOCKED_DEVICE_REQUIRED" am: 2b4d64806c am: e7f05c6fb9
am: 1d336a9fcc
Change-Id: I915d71124dbbb4d444cd458f7aeb658e1fc336ea
| -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. |