| commit | 6d4645594c0c2123fd409af6f9fe7217a6c7f7bd | [log] [tgz] |
|---|---|---|
| author | Alice Wang <aliceywang@google.com> | Wed Jun 14 14:27:07 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 14 14:27:07 2023 +0000 |
| tree | 63d3289df3c236977e22d00b3bab55154cbefbfa | |
| parent | d7934139ec2d87fece9cb105a05e74326f503a3c [diff] | |
| parent | 57d0be120b694b09a1ae66bf74dcffcd1d7535ed [diff] |
Merge "[vmbase] Move SwiotlbInfo from pvmfw to vmbase" am: 456b8ea5e4 am: 0955a4aeb7 am: 57d0be120b Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2624509 Change-Id: I9b99fb83bf3110b7b2ff2b4bd292b37b997c6b14 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); }