| commit | 97730ec3d81a2f9b687fdd75fe55ad2cd02fcd1c | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Aug 02 03:09:28 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 02 03:09:28 2021 +0000 |
| tree | 6dc3918f4f083133563305536a4693502ff4a4d4 | |
| parent | c6cc42dff7c426d71a880a18ac85d2463512c9cc [diff] | |
| parent | 5bcae080d483691a0d906b67ce304500630418dc [diff] |
Merge "KeyMaster 4.0 VTS: fix GSI detection" into sc-dev am: cee75918e2 am: 5bcae080d4 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15284500 Change-Id: Ie68b06afd1659cef6a174ad0d124b218ad27909d
diff --git a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp index 01c502c..476eed8 100644 --- a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp +++ b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
@@ -438,7 +438,7 @@ // TODO(b/136282179): When running under VTS-on-GSI the TEE-backed // keymaster implementation will report YYYYMM dates instead of YYYYMMDD // for the BOOT_PATCH_LEVEL. - if (avb_verification_enabled()) { + if (!is_gsi()) { for (int i = 0; i < att_hw_enforced.size(); i++) { if (att_hw_enforced[i].tag == TAG_BOOT_PATCHLEVEL || att_hw_enforced[i].tag == TAG_VENDOR_PATCHLEVEL) {