| commit | 8b19a2c7873a78af2c18b3291f2020d95507d328 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Aug 15 17:25:51 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 15 17:25:51 2023 +0000 |
| tree | 760e3ac5d8658acfbb7887d606afc191a6250c4d | |
| parent | 078f88b59f61e9e268a70353f7b3693bdda757dd [diff] | |
| parent | d35553f99673c0a552bb1f09db37fea24db25fc6 [diff] |
Merge "Add VSR annotation to KeyMint tests" into main am: a2441d9090 am: dfa27bbd75 am: 9352d1a7c8 am: d35553f996 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2690468 Change-Id: I2eeb73a70b5f28ebcc5746b4602185bfd461a46c 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 1e61a18..e539317 100644 --- a/security/keymint/aidl/vts/functional/KeyMintTest.cpp +++ b/security/keymint/aidl/vts/functional/KeyMintTest.cpp
@@ -8755,6 +8755,7 @@ 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 @@ 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__) {