| commit | e07c8798a31194a03f37a33cbb9a872b98d97e8d | [log] [tgz] |
|---|---|---|
| author | Alice Wang <aliceywang@google.com> | Wed Sep 27 16:27:50 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 27 16:27:50 2023 +0000 |
| tree | 1eedc922ec1a6097f1a5bc490658880478ef6eba | |
| parent | 1a22d03fc59a8ad269f75cca9ea189612713dd30 [diff] | |
| parent | 0161bb0cafb70ef0d42097a69cfbcd95dbf6e8d1 [diff] |
Merge "[rkp] Derive HMAC key from DICE sealing CDI" into main am: 0161bb0caf Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2759007 Change-Id: Ic4c39c475a0566bdae6e7fad67ab8ea3570ea0a1 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); }