Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e3dcf88 authored by Eran Messeri's avatar Eran Messeri Committed by Automerger Merge Worker
Browse files

Merge "Enforce KeyMint v3 for VSR level 14" am: 576a5d4b am: c637f903 am: af77e4e1 

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



Change-Id: Id2c7fdf594a550f95828eff990f4a9e67a5b82df
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c89a0bd6 af77e4e1

security/keymint/aidl/vts/functional/KeyMintTest.cpp

+8 −0
Original line number Diff line number Diff line
@@ -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