Merge "rollbackProtectedDataOfPayload: Assume UpdatableVM" into main am: 9907cb9b4c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3453215
Change-Id: I8fcd37047ec1806ebc259efd7302a1f7e186959f
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 8502ec3..a2b4747 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -1874,22 +1874,13 @@
return false;
}
- private void ensureUpdatableVmSupported() throws Exception {
- if (getVendorApiLevel() >= 202504 && deviceCapableOfProtectedVm()) {
- assertTrue(
- "Missing Updatable VM support, have you declared Secretkeeper interface?",
- isUpdatableVmSupported());
- } else {
- assumeTrue("Device does not support Updatable VM", isUpdatableVmSupported());
- }
- }
-
@Test
public void rollbackProtectedDataOfPayload() throws Exception {
assumeSupportedDevice();
// Rollback protected data is only possible if Updatable VMs is supported -
// which implies Secretkeeper support.
- ensureUpdatableVmSupported();
+ assumeTrue("Missing Updatable VM support", isUpdatableVmSupported());
+
byte[] value1 = new byte[32];
Arrays.fill(value1, (byte) 0xcc);
byte[] value2 = new byte[32];