commit 9a995a6c7f3f854d63607b5c8acd24caea097ad4
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jun 13 16:41:56 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 13 16:41:56 2023 +0000
tree 76bdd3f63e865e65f77c90ac606893b29a951f75
parent cd05ec4a3c7fa17ef93bbeaa21733d3315712a08
parent b595dd929cd7cc5484e182ff8957c2dc4b8e08e5

Merge "[rialto][fdt] Map and validate FDT range in memory before parsing" am: 0be4f0f124 am: 4815809dc4 am: b595dd929c

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

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