commit ead8b836358ca8a3889ed2cd393d77d38ee47079
author Nikita Ioffe <ioffe@google.com> Thu Jun 15 13:14:18 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 15 13:14:18 2023 +0000
tree bd67ecdaebf0c3bf1a3ccbdc02631dd26959040a
parent 0161af27c9fde8466ed5c7ab24009e97c7a764c3
parent 2785a6898c35135057b6dab60c499d39e9041fa4

Merge changes from topic "reland-remove-vendor" am: 778df58236 am: 442f99eb62 am: 2785a6898c

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

Change-Id: I11cc032cce8a0d39f5e0eb07915c7c362d633bd5
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 42a3085..a9c404f 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);
     }