| commit | 3cf49dd8582bf1733e47591c0255a2fd000b3856 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Jun 15 17:42:40 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 15 17:42:40 2023 +0000 |
| tree | 4dddc64d6c1968f99af31d6c71726accdf65fc23 | |
| parent | ead8b836358ca8a3889ed2cd393d77d38ee47079 [diff] | |
| parent | 60d59b2d20b7d45bbda4521c367f7b5bdb2450b6 [diff] |
Merge "[pvmfw][fdt] Do not panic if the DT has no /chosen node" am: 08ead4a106 am: 8f4b2777f6 am: 60d59b2d20 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2626491 Change-Id: Iadc2b21895ce89f987053ece931caa221a00dc60 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); }