diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppAutoFocusHelper.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppAutoFocusHelper.kt index 619a05efb72c6..bd7c1855fea9c 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppAutoFocusHelper.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppAutoFocusHelper.kt @@ -34,7 +34,7 @@ class ImeAppAutoFocusHelper @JvmOverloads constructor( wmHelper: WindowManagerStateHelper? ) { // do nothing (the app is focused automatically) - waitAndAssertIMEShown(device, wmHelper) + waitIMEShown(device, wmHelper) } override fun open() { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppHelper.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppHelper.kt index d8091a93dc63f..83fddae5b1a7d 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppHelper.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppHelper.kt @@ -51,17 +51,17 @@ open class ImeAppHelper @JvmOverloads constructor( "was left in an unknown state (e.g. in split screen)" } editText.click() - waitAndAssertIMEShown(device, wmHelper) + waitIMEShown(device, wmHelper) } - protected fun waitAndAssertIMEShown( + protected fun waitIMEShown( device: UiDevice, wmHelper: WindowManagerStateHelper? = null ) { if (wmHelper == null) { device.waitForIdle() } else { - require(wmHelper.waitImeWindowShown()) { "IME did not appear" } + wmHelper.waitImeWindowShown() } } @@ -78,7 +78,7 @@ open class ImeAppHelper @JvmOverloads constructor( if (wmHelper == null) { device.waitForIdle() } else { - require(wmHelper.waitImeWindowGone()) { "IME did did not close" } + wmHelper.waitImeWindowGone() } } } \ No newline at end of file