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

Commit 7bd7dac7 authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "Re-order skip checks for attestation tests" am: 475bb11a 

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



Change-Id: Iae354db3266af485f5ead62dd554f4545807627e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 94c87272 475bb11a

security/keymint/aidl/vts/functional/AttestKeyTest.cpp

+3 −2
Original line number Diff line number Diff line
@@ -172,8 +172,9 @@ class AttestKeyTest : public KeyMintAidlTestBase { 
    //     allowing it to be launched with Android S (or later) with Keymaster 4.0

    //     in StrongBox

    void check_skip_test(void) const {

        if (is_attest_key_feature_disabled() && is_strongbox_enabled() &&

            is_chipset_allowed_km4_strongbox()) {

        // Check the chipset first as that doesn't require a round-trip to Package Manager.

        if (is_chipset_allowed_km4_strongbox() && is_strongbox_enabled() &&

            is_attest_key_feature_disabled()) {

            GTEST_SKIP() << "Test is not applicable";

        }

    }