tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Re-order skip checks for attestation tests"

Browse source
This commit is contained in:
David Drysdale 2023-03-10 07:11:56 +00:00 committed by Gerrit Code Review
commit 475bb11af0
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
security/keymint/aidl/vts/functional/AttestKeyTest.cpp
View file

@ -172,8 +172,9 @@ class AttestKeyTest : public KeyMintAidlTestBase {
// allowing it to be launched with Android S (or later) with Keymaster 4.0 // allowing it to be launched with Android S (or later) with Keymaster 4.0
// in StrongBox // in StrongBox
void check_skip_test(void) const { void check_skip_test(void) const {
if (is_attest_key_feature_disabled() && is_strongbox_enabled() && // Check the chipset first as that doesn't require a round-trip to Package Manager.
is_chipset_allowed_km4_strongbox()) { if (is_chipset_allowed_km4_strongbox() && is_strongbox_enabled() &&
is_attest_key_feature_disabled()) {
GTEST_SKIP() << "Test is not applicable"; GTEST_SKIP() << "Test is not applicable";
} }
} }