| commit | 0e3dcf886d0c4a4bc850429140d0f8227bcf1c7a | [log] [tgz] |
|---|---|---|
| author | Eran Messeri <eranm@google.com> | Wed Dec 21 12:29:13 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 21 12:29:13 2022 +0000 |
| tree | 86048d2ff8e76619373d2b85ada4afa4646164dc | |
| parent | c89a0bd60aca34bb0be21e1c36b2fb7a31a5a657 [diff] | |
| parent | af77e4e19b544b566cb149c8afbdfa0af24c1330 [diff] |
Merge "Enforce KeyMint v3 for VSR level 14" am: 576a5d4b2d am: c637f903e4 am: af77e4e19b Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2358780 Change-Id: Id2c7fdf594a550f95828eff990f4a9e67a5b82df 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