| commit | 01c85287fc659df4bbcff9e060e7215ece3f18bb | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Apr 18 20:30:45 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 18 20:30:45 2023 +0000 |
| tree | adc9ec9cdc518682132ba572de0ea5a12862b493 | |
| parent | 87772daece53bb3bb40c5efa0ef09f896d9b9dc6 [diff] | |
| parent | 08029e9d140387af386fc9c5f58f693afb613e1f [diff] |
Merge "Use new psci::smccc error handling rather than smccc library." am: 16b18090fa am: 475408e5a6 am: 08029e9d14 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2537916 Change-Id: I18cbb8f089a58adf22fdefbf1a8794fcb0063a7d 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); }