From 7cabdc10dbeaf5778f423289025a8823765f7b96 Mon Sep 17 00:00:00 2001 From: Tommy Chiu Date: Thu, 16 Feb 2023 09:39:18 +0000 Subject: [PATCH] Fix test assumption for KeyMint+RKP integration According to the API Level definition (https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels), both 31 and 32 are belong to Android-12 (S). Bug: 263844771 Change-Id: I92e3f9015607ad9421c02442033e9b586ae07bcb Test: VtsAidlKeyMintTargetTest #EcdsaWithRkpAttestation --- security/keymint/aidl/vts/functional/KeyMintTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/keymint/aidl/vts/functional/KeyMintTest.cpp b/security/keymint/aidl/vts/functional/KeyMintTest.cpp index 1b9e758b11..357405ffb4 100644 --- a/security/keymint/aidl/vts/functional/KeyMintTest.cpp +++ b/security/keymint/aidl/vts/functional/KeyMintTest.cpp @@ -1214,7 +1214,7 @@ TEST_P(NewKeyGenerationTest, RsaWithRkpAttestation) { * that has been generated using an associate IRemotelyProvisionedComponent. */ TEST_P(NewKeyGenerationTest, EcdsaWithRkpAttestation) { - if (get_vsr_api_level() < 32 || AidlVersion() < 2) { + if (get_vsr_api_level() <= 32 || AidlVersion() < 2) { GTEST_SKIP() << "Only required for VSR 12+ and KeyMint 2+"; }