| commit | 09c81cfc46b33ba3172517f3d9c53157c3993ae3 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Apr 21 11:39:20 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 21 11:39:20 2023 +0000 |
| tree | f47c3ba2c20e56e05cedea54cb0ec2b94539a82c | |
| parent | 8a0bf5f1ba8779a375ca26a9b084d2b354a6a918 [diff] | |
| parent | f10ff5e73c0159954414d93eb661c1db10ee2ac6 [diff] |
Merge "pvmfw: Prevent mapping MMIO over pvmfw memory" am: 4f3d523b02 am: b40c4a5fe8 am: f10ff5e73c Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2544930 Change-Id: Iec20e24a5f9342587593d0bff4b4467716bde24e 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 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); }