commit | dfa27bbd7501a54aaf9e328b3670f8a5c0eb19b0 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Aug 15 14:53:02 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 15 14:53:02 2023 +0000 |
tree | f05eab96181c9804f4fa39f53e954e71acc7d73b | |
parent | 28fa78935703be662c7fd628052d52ace936de2a [diff] | |
parent | a2441d9090ea46aeb40734917ba28b364b171476 [diff] |
Merge "Add VSR annotation to KeyMint tests" into main am: a2441d9090 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2690468 Change-Id: Ib39261a89c371b3686de8017178c40cc3be76a6f 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__) {