commit b3bfc47e53063d4b41251b389cf72068de91422a
author Alan Stokes <alanstokes@google.com> Mon Oct 02 14:20:49 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 02 14:20:49 2023 +0000
tree bf0c8e548e35a65b3fee19fc6410bb7a5730634b
parent cea050f7ddd9ba3d2157e1e8563309d29889710b
parent e6a6518eb25c2a073f05dcadf8a7210e97b3650c

Merge changes from topic "b/302677468" into main am: e6a6518eb2

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

Change-Id: I23d26361b45da6eb426202411344f2adf6c9424c
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 d861761..489e0a6 100644
--- a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
+++ b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
@@ -190,7 +190,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);
     }