| commit | 2c9b02187a6f965887f51d189ef936e19ffa8537 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Sat Sep 30 12:31:33 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 30 12:31:33 2023 +0000 |
| tree | 9d71de5fa08680d76631adac135b1d0edabf7d6f | |
| parent | ee4cd3cc7e9711e9f6284195eb61310faeb54449 [diff] | |
| parent | 90e1ad425c1ee04004dee126b1de83e44b436aa9 [diff] |
Merge "[pvmfw] Use hkdf from libbssl instead of bssl bindgen" into main am: 90e1ad425c Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2767849 Change-Id: Ie84225e8f9d50aa96054bd327288d2f4f5a8a360 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 d861761..489e0a6 100644 --- a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java +++ b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
@@ -190,7 +190,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); }