Merge "Enforce KeyMint v3 for VSR level 14" am: 576a5d4b2d am: c637f903e4

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2358780

Change-Id: Ib08d3e15c0791b02da842e43b662150604365d98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eran Messeri
2022-12-21 11:46:29 +00:00
committed by Automerger Merge Worker

View File

@@ -8609,6 +8609,14 @@ TEST_P(VsrRequirementTest, Vsr13Test) {
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