| commit | 8c433d1a55b545de7792584124d59551cd00a0e1 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Aug 02 02:58:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 02 02:58:12 2021 +0000 |
| tree | 1e10b13b41d917795858a41e61d20f664bfe9a9e | |
| parent | 8bdf1ec5354e0c8eed12d3c4998d64bd3e083caa [diff] | |
| parent | cee75918e27f67c2016040de1f121b732895d936 [diff] |
Merge "KeyMaster 4.0 VTS: fix GSI detection" into sc-dev am: cee75918e2 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15284500 Change-Id: Ifa2ea1e7534ecacd148d7177341d1db053ee1cec
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) {