| commit | 024ede02290ad836664f319b815720a64b85b24f | [log] [tgz] |
|---|---|---|
| author | Cosmin Băieș <cosminbaies@google.com> | Mon Aug 21 08:49:17 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 21 08:49:17 2023 +0000 |
| tree | 753a53c854aa15a2b0dc548873ef82e485e75f5f | |
| parent | 93123c38a277b284d4a1d4cc6021a2b8021894e3 [diff] | |
| parent | 08497eca4a48b30aa269210f048e2aa3f5e89559 [diff] |
Merge "Ensure waitOnMainUntil runs on the main thread" into udc-qpr-dev am: 08497eca4a Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24464970 Change-Id: I74232fd0b6b6c50dc3b7de3155fec5977ec20a6c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/ImeStressTestUtil.java b/tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/ImeStressTestUtil.java index c9b5c96..12556bc 100644 --- a/tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/ImeStressTestUtil.java +++ b/tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/ImeStressTestUtil.java
@@ -154,7 +154,7 @@ * <p>The given {@code pred} will be called on the main thread. */ public static void waitOnMainUntil(String message, Callable<Boolean> pred) { - eventually(() -> assertWithMessage(message).that(pred.call()).isTrue(), TIMEOUT); + eventually(() -> assertWithMessage(message).that(callOnMainSync(pred)).isTrue(), TIMEOUT); } /** Waits until IME is shown, or throws on timeout. */