diff options
| -rw-r--r-- | tests/Input/Android.bp | 1 | ||||
| -rw-r--r-- | tests/Input/src/com/android/test/input/AnrTest.kt | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/tests/Input/Android.bp b/tests/Input/Android.bp index c0cbdc3f96f8..fc0b1f54471c 100644 --- a/tests/Input/Android.bp +++ b/tests/Input/Android.bp @@ -32,6 +32,7 @@ android_test { "androidx.test.uiautomator_uiautomator", "compatibility-device-util-axt", "cts-input-lib", + "cts-wm-util", "flag-junit", "frameworks-base-testutils", "hamcrest-library", diff --git a/tests/Input/src/com/android/test/input/AnrTest.kt b/tests/Input/src/com/android/test/input/AnrTest.kt index 6b95f5c10a1e..8d3a5ea0be29 100644 --- a/tests/Input/src/com/android/test/input/AnrTest.kt +++ b/tests/Input/src/com/android/test/input/AnrTest.kt @@ -29,6 +29,7 @@ import android.os.IInputConstants.UNMULTIPLIED_DEFAULT_DISPATCHING_TIMEOUT_MILLI import android.os.SystemClock import android.provider.Settings import android.provider.Settings.Global.HIDE_ERROR_DIALOGS +import android.server.wm.CtsWindowInfoUtils.waitForStableWindowGeometry import android.testing.PollingCheck import androidx.test.uiautomator.By @@ -38,6 +39,8 @@ import androidx.test.uiautomator.Until import com.android.cts.input.UinputTouchScreen +import java.util.concurrent.TimeUnit + import org.junit.After import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue @@ -183,5 +186,6 @@ class AnrTest { val flags = " -W -n " val startCmd = "am start $flags $PACKAGE_NAME/.UnresponsiveGestureMonitorActivity" instrumentation.uiAutomation.executeShellCommand(startCmd) + waitForStableWindowGeometry(5L, TimeUnit.SECONDS) } } |