commit | 8f3b13ed7bb5c6056dca564d31dcd0b1303f7a3d | [log] [tgz] |
---|---|---|
author | Shikha Panwar <shikhapanwar@google.com> | Wed Oct 04 17:47:31 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 04 17:47:31 2023 +0000 |
tree | 69fb10889d362cb17bf1532d6f57f537a0f0ed61 | |
parent | d817c684507cbe7352c9ce22a6ae338b9444f954 [diff] | |
parent | 3c43b45e63ee2355b92cc87ce9d54cc77c540a22 [diff] |
Merge "Latest kernel SecretkeeperProtection capability" into main am: 3c43b45e63 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2769601 Change-Id: Iaf5c35813ddfbb13891456bcd415a0cd366a7fdd 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); }