commit 8a0bf5f1ba8779a375ca26a9b084d2b354a6a918
author Jakob Vukalović <jakobvukalovic@google.com> Thu Apr 20 18:49:23 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 20 18:49:23 2023 +0000
tree 8cb3ee3672881a0a8b0540e749c402a371a3af80
parent f29db863af51417c8e0dcc1c3242d439f986676a
parent db18dc056f2d2d5dde351d5d7e45631a4d393b0d

Merge "pvmfw: Move MemoryTracker to a global variable" am: 99fd385823 am: 99320e64d1 am: db18dc056f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2548232

Change-Id: I351f90828a97554a5fbe290921076891a3547482
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java

diff --git a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
index dabb31d..153699b 100644
--- a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
+++ b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
@@ -187,7 +187,7 @@
         long start = System.currentTimeMillis();
         while ((System.currentTimeMillis() - start < timeoutMillis)
                 && !matcher.matches(callable.call())) {
-            Thread.sleep(500);
+            RunUtil.getDefault().sleep(500);
         }
         assertThat(callable.call(), matcher);
     }