| commit | 6c8900285cd692cba176a2835f2475378f40cb1d | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Jan 23 08:55:30 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 23 08:55:30 2025 -0800 |
| tree | 8ddd58d61ced5e0f59ee1d3e629feb441dab0ad5 | |
| parent | b5703fdc27286a8fc8ae5481dc299ba1e5a0eb70 [diff] | |
| parent | 5467ed3115132766c20e413297901848bf0eee5b [diff] |
Merge "rpDataTest: Assume UpdatableVM" into main am: 5467ed3115 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3461788 Change-Id: I5a7efe8db800a47950596dc45026dede31ed33cb 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