| commit | 14c67ceb104b6848ec2c44f1ebeab326ff04082b | [log] [tgz] |
|---|---|---|
| author | Alice Wang <aliceywang@google.com> | Mon Dec 16 06:23:39 2024 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 16 06:23:39 2024 -0800 |
| tree | fd64371af9476e49f744dd6e70f94541b94019d9 | |
| parent | 567cc44cf7f48c8c2b8c1f17685451ec65f5f4d7 [diff] | |
| parent | d6eecf0dcd00613181a94d4518b0205810f73f47 [diff] |
Merge "Run AvfRkpdVmAttestationTestApp for vendor API >= 202504" into main am: d6eecf0dcd Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3345786 Change-Id: I30306621fb6bb6f6eaff2408ababeac139093cfa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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.