| commit | 39881b5a13497774dea88df3d15d9119468ca665 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Fri Mar 10 08:29:13 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 10 08:29:13 2023 +0000 |
| tree | 3bdf997ea69c3f43e090824a13c9bb7e1c4d09b2 | |
| parent | 3b05ed321c74529060c598ae515d9d479c6d5f08 [diff] | |
| parent | 51fb09308700422873daab781cf5ad7a31b1a8b1 [diff] |
Merge "Re-order skip checks for attestation tests" am: 475bb11af0 am: 7bd7dac78e am: 51fb093087 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2479695 Change-Id: Iaee8613b8135daab9bfd068b42593ab822d6b74b 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"; } }