| commit | c637f903e4538a0f815ab837fb630920e12f9ffa | [log] [tgz] |
|---|---|---|
| author | Eran Messeri <eranm@google.com> | Wed Dec 21 11:12:29 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 21 11:12:29 2022 +0000 |
| tree | bf1bd18515eb4881f9c8f6fdfcd7f20f5c3aecbc | |
| parent | 356795a1494c7c05b6abc04b5b078f3e1b5ae571 [diff] | |
| parent | 576a5d4b2d7fc8f32b17a48cc65d4fe2f59c8e8d [diff] |
Merge "Enforce KeyMint v3 for VSR level 14" am: 576a5d4b2d Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2358780 Change-Id: I1f9165670553371f1a020fa123f182e1bd422fb7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/security/keymint/aidl/vts/functional/KeyMintTest.cpp b/security/keymint/aidl/vts/functional/KeyMintTest.cpp index 5a86283..ca18082 100644 --- a/security/keymint/aidl/vts/functional/KeyMintTest.cpp +++ b/security/keymint/aidl/vts/functional/KeyMintTest.cpp
@@ -8609,6 +8609,14 @@ EXPECT_GE(AidlVersion(), 2) << "VSR 13+ requires KeyMint version 2"; } +TEST_P(VsrRequirementTest, Vsr14Test) { + int vsr_api_level = get_vsr_api_level(); + if (vsr_api_level < 34) { + GTEST_SKIP() << "Applies only to VSR API level 34, this device is: " << vsr_api_level; + } + EXPECT_GE(AidlVersion(), 3) << "VSR 14+ requires KeyMint version 3"; +} + INSTANTIATE_KEYMINT_AIDL_TEST(VsrRequirementTest); } // namespace aidl::android::hardware::security::keymint::test