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" am: 475bb11af0 am: 7bd7dac78e

Browse source 
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>
This commit is contained in:
David Drysdale 2023-03-10 07:49:52 +00:00 committed by Automerger Merge Worker
commit 51fb093087
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
// 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";
}
}