Merge "KeyMaster 4.0 VTS: fix GSI detection" into sc-dev

This commit is contained in:
TreeHugger Robot
2021-08-02 02:44:32 +00:00
committed by Android (Google) Code Review

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) {