commit 9c237be297fe18a4f4f36f7070874d9e5ad7dcb5
author Alice Wang <aliceywang@google.com> Tue Aug 27 08:51:30 2024 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Mon Sep 02 07:48:11 2024 +0000
tree 782a1f1fe680408147fd91e76919ee4ecb23d530
parent 826a3bb34470ffc12cab45fe09453815b4d2f4ea

[vsr-test] Relax the pVM DICE chain verification test

As the VSR has been downgraded to Strongly Recommended.

Bug: 362135892
Test: atest MicrodroidTests
(cherry picked from https://android-review.googlesource.com/q/commit:e7344de2a38772bedc224edc7ce21fdd0007c263)
Merged-In: I2d75a73c04d11e7b1adc70d9c8ed6c15404e689d
Change-Id: I2d75a73c04d11e7b1adc70d9c8ed6c15404e689d

tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java

diff --git a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
index 915e492..9629f37 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -1308,7 +1308,7 @@
     }
 
     @Test
-    @VsrTest(requirements = {"VSR-7.1-001.005"})
+    @VsrTest(requirements = {"VSR-7.1-001.004"})
     public void protectedVmHasValidDiceChain() throws Exception {
         // This test validates two things regarding the pVM DICE chain:
         // 1. The DICE chain is well-formed that all the entries conform to the DICE spec.
@@ -1316,7 +1316,7 @@
         assumeSupportedDevice();
         assumeProtectedVM();
         assumeVsrCompliant();
-        assumeTrue("Vendor API must be at least 202404", getVendorApiLevel() >= 202404);
+        assumeTrue("Vendor API must be newer than 202404", getVendorApiLevel() > 202404);
 
         grantPermission(VirtualMachine.USE_CUSTOM_VIRTUAL_MACHINE_PERMISSION);
         VirtualMachineConfig config =