commit ac5d54aa71d040dc2bbef5028cf5a1bd605947b9
author Jakob Vukalović <jakobvukalovic@google.com> Wed Apr 19 18:20:44 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 19 18:20:44 2023 +0000
tree 27d610b058a12162fa00e081e5d343a279848c22
parent a172410ae09f91ae65938140d00bbd9830a33d48
parent 4c0054a03b2a2b1e3986f294872f12ed2e1f4606

Merge "vmbase: Temporarily disable logging in exception handlers" am: 42a20772bf am: c1eed10063 am: 4c0054a03b

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

Change-Id: Iad06bc1a6b2d40c8388d72eeb50aa30bba666e41
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);
     }