| commit | ee4cd3cc7e9711e9f6284195eb61310faeb54449 | [log] [tgz] |
|---|---|---|
| author | Alice Wang <aliceywang@google.com> | Fri Sep 29 19:43:41 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 19:43:41 2023 +0000 |
| tree | eb78194a00293b6ac3e131fea29776aa31fceefb | |
| parent | d7051691478b44587472c747ca64488b66ffc9d0 [diff] | |
| parent | e2964bc4d736d43e87a67f50c79cab387e5f0d88 [diff] |
Merge "[bssl] Add HKDF wrapper to libbssl" into main am: e2964bc4d7 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2763073 Change-Id: If3d5036a95051eb6cd2b50697369da60cba77f8e 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); }