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

Commit d35553f9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add VSR annotation to KeyMint tests" into main am: a2441d90 am: dfa27bbd am: 9352d1a7 

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



Change-Id: I17718e01a99d0892031148835a7d7180df7ac149
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1e8a070b 9352d1a7

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

+2 −0
Original line number Diff line number Diff line
@@ -8755,6 +8755,7 @@ INSTANTIATE_KEYMINT_AIDL_TEST(UnlockedDeviceRequiredTest); 


using VsrRequirementTest = KeyMintAidlTestBase;



// @VsrTest = VSR-3.10-008

TEST_P(VsrRequirementTest, Vsr13Test) {

    int vsr_api_level = get_vsr_api_level();

    if (vsr_api_level < __ANDROID_API_T__) {
@@ -8763,6 +8764,7 @@ TEST_P(VsrRequirementTest, Vsr13Test) { 
    EXPECT_GE(AidlVersion(), 2) << "VSR 13+ requires KeyMint version 2";

}



// @VsrTest = VSR-3.10-013.001

TEST_P(VsrRequirementTest, Vsr14Test) {

    int vsr_api_level = get_vsr_api_level();

    if (vsr_api_level < __ANDROID_API_U__) {