commit d6eecf0dcd00613181a94d4518b0205810f73f47
author Alice Wang <aliceywang@google.com> Mon Dec 16 06:19:10 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 16 06:19:10 2024 -0800
tree fd64371af9476e49f744dd6e70f94541b94019d9
parent a246251ef36cdb5c5e09bdc55323d71a21c7fbea
parent 1077fd6e3701e49465afe96dada950e6859cd1c0

Merge "Run AvfRkpdVmAttestationTestApp for vendor API >= 202504" into main

tests/vm_attestation/src/java/com/android/virt/rkpd/vm_attestation/testapp/RkpdVmAttestationTest.java

diff --git a/tests/vm_attestation/src/java/com/android/virt/rkpd/vm_attestation/testapp/RkpdVmAttestationTest.java b/tests/vm_attestation/src/java/com/android/virt/rkpd/vm_attestation/testapp/RkpdVmAttestationTest.java
index 1762b6d..02d9c49 100644
--- a/tests/vm_attestation/src/java/com/android/virt/rkpd/vm_attestation/testapp/RkpdVmAttestationTest.java
+++ b/tests/vm_attestation/src/java/com/android/virt/rkpd/vm_attestation/testapp/RkpdVmAttestationTest.java
@@ -85,9 +85,7 @@
         assume().withMessage("RKP Integration tests rely on network availability.")
                 .that(isNetworkConnected(getContext()))
                 .isTrue();
-        assume().withMessage("Test needs Remote Attestation support")
-                .that(getVirtualMachineManager().isRemoteAttestationSupported())
-                .isTrue();
+        ensureVmAttestationSupported();
 
         if (mOs == "microdroid") {
             // We don't need this permission to use the microdroid kernel.