Merge "Remove VM attestation flag check in MicrodroidTests" into main am: 12265ad0a0 am: 8a7d7e605c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3413802
Change-Id: Ib91425f5dc04357f5f7dbff56adad79aadf91ce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 dff408c..e6ac490 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -253,7 +253,6 @@
public void vmAttestationWhenRemoteAttestationIsNotSupported() throws Exception {
// pVM remote attestation is only supported on protected VMs.
assumeProtectedVM();
- assumeFeatureEnabled(VirtualMachineManager.FEATURE_REMOTE_ATTESTATION);
assume().withMessage(
"This test does not apply to a device that supports Remote Attestation")
.that(getVirtualMachineManager().isRemoteAttestationSupported())
@@ -282,7 +281,6 @@
public void vmAttestationWithVendorPartitionWhenSupported() throws Exception {
// pVM remote attestation is only supported on protected VMs.
assumeProtectedVM();
- assumeFeatureEnabled(VirtualMachineManager.FEATURE_REMOTE_ATTESTATION);
assume().withMessage("Test needs Remote Attestation support")
.that(getVirtualMachineManager().isRemoteAttestationSupported())
.isTrue();