commit | f29db863af51417c8e0dcc1c3242d439f986676a | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 20 14:24:56 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 20 14:24:56 2023 +0000 |
tree | 51cd70f5f2afa9014c2189d920b8f794b0829ca6 | |
parent | 59818e3b36a1b4983f22729d22f797efc514ad8e [diff] | |
parent | 1cbbf1cfed3ebbf7bfb6cc24a862948a0e6c788a [diff] |
Merge "Disallow UDS-rooted BCC" am: 77d32d5e2c am: 3c42d3fe4b am: 1cbbf1cfed Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2547033 Change-Id: I6e628da521ee8fd4fdb0d30e3f0bb08cb8cfabc1 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 dabb31d..153699b 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); }