| commit | 51fb09308700422873daab781cf5ad7a31b1a8b1 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Fri Mar 10 07:49:52 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 10 07:49:52 2023 +0000 |
| tree | 31d1255dab221a48dd5a3ac929c1aa1815d2c37b | |
| parent | 82522286229b6b1fc7af4758c7da6850fe706839 [diff] | |
| parent | 7bd7dac78efd2d51128725380bc498146981980d [diff] |
Merge "Re-order skip checks for attestation tests" am: 475bb11af0 am: 7bd7dac78e Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2479695 Change-Id: Iffd0c73d91fe620dffe7dbc787245e2dd40f70b0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/security/keymint/aidl/vts/functional/AttestKeyTest.cpp b/security/keymint/aidl/vts/functional/AttestKeyTest.cpp index bbf3633..8ffc179 100644 --- a/security/keymint/aidl/vts/functional/AttestKeyTest.cpp +++ b/security/keymint/aidl/vts/functional/AttestKeyTest.cpp
@@ -172,8 +172,9 @@ // 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"; } }