Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72c53ebc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I98047310104179b2c43dffe38eed6da8683ff62b
parents 37d65eb2 cee75918

keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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) {