| commit | 7d71b79a1f3636ec49632735408e4ee18b751141 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Jan 23 09:07:57 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 23 09:07:57 2025 -0800 |
| tree | 0739bd630d360391139c816cafd5a780daa8b072 | |
| parent | b8fa3caa4e467ef55a8ddaeb45bd41f5a7157cb6 [diff] | |
| parent | 6c8900285cd692cba176a2835f2475378f40cb1d [diff] |
Merge "rpDataTest: Assume UpdatableVM" into main am: 5467ed3115 am: 6c8900285c Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3461788 Change-Id: I2090800a8bc3f32c36cd703f87c51514c539543e 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 7431a72..3ece140 100644 --- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java +++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -1926,6 +1926,11 @@ @Test public void rollbackProtectedDataCanBeAccessedPostConnectionExpiration() throws Exception { + assumeSupportedDevice(); + // Rollback protected data is only possible if Updatable VMs is supported - + // which implies Secretkeeper support. + assumeTrue("Missing Updatable VM support", isUpdatableVmSupported()); + final long vmSize = minMemoryRequired(); // The reference implementation of Secretkeeper maintains 4 live session keys, // dropping the oldest one when new connections are requested. Therefore we spin 8 VMs