| commit | 01a2c6573385394738b5feef9df2afc683ae0f2c | [log] [tgz] |
|---|---|---|
| author | Nikita Ioffe <ioffe@google.com> | Wed Jun 14 16:37:50 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 14 16:37:50 2023 +0000 |
| tree | aaf070d23b5eb60c1f8cce5b35e96e2279fd1cd0 | |
| parent | ea8fb255e01f69b733049b3518f04f0efc332884 [diff] | |
| parent | d82be60a239b54a1e8627f3686b8a4b70b9ba37b [diff] |
Merge changes from topic ",microdroid-precompiled-sepolicy-on-system" am: e23fbc63af am: d7f434ef85 am: d82be60a23 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2625691 Change-Id: Ia28900e9d9f7625b3095231340d8439dd6ba2b0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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); }