KeyMaster 4.0 VTS: fix GSI detection am: 13cddcb298

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1784569

Change-Id: I816d3925f2c38dafa3002415b2ea2f52e5bc53db
This commit is contained in:
David Drysdale
2021-08-04 07:23:12 +00:00
committed by Automerger Merge Worker

View File

@@ -438,7 +438,7 @@ bool verify_attestation_record(const string& challenge, const string& app_id,
// 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) {