| commit | f9ff42e7c4c92dd65b14a068f6d3bb8401195784 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jun 22 12:40:03 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 22 12:40:03 2023 +0000 |
| tree | adb333f3310effec92b71157ea1e85109bdae294 | |
| parent | 50d761d9b62bb9d75064d51dfb3fa927ebbd0c37 [diff] | |
| parent | ebdc53f60982892c88532a076532e9efe79ba115 [diff] |
Merge "pvmfw: Panic on fill_with_entropy error for BSSL" am: 188ab2e6b1 am: 2a87d5a0b0 am: ebdc53f609 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2634649 Change-Id: Id208d097be40327a2bf1355ec7dee60f221bd384 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); }