| commit | abdb9afb690e89029816d8750f554fde3d1c3877 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Wed Aug 04 07:23:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 04 07:23:12 2021 +0000 |
| tree | 7232d6a4c6a3e92e86af22e006f175a3893e2c4d | |
| parent | a0b00c4b31d74081ecbe81c2b7d1179eea9e33fd [diff] | |
| parent | 13cddcb2984dc2d03f4e59f84e55e8836f8045a9 [diff] |
KeyMaster 4.0 VTS: fix GSI detection am: 13cddcb298 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1784569 Change-Id: I816d3925f2c38dafa3002415b2ea2f52e5bc53db
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) {