commit 9b5b0c95986e58646beeea58ea102caf0d5c2c9a
author Sunny Goyal <sunnygoyal@google.com> Mon Nov 18 23:53:14 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 18 23:53:14 2024 +0000
tree fb91e53d4d51601dc18dc3dc173db943aab6e481
parent ddb05462772d32499a19372689b4f7fa4287beca
parent 82efdccc6e0883465c751f4648aa00d1dd2b2ccb

Merge "Wait for animations before injecting input event" into main

tests/src/com/android/launcher3/util/BaseLauncherActivityTest.kt

diff --git a/tests/src/com/android/launcher3/util/BaseLauncherActivityTest.kt b/tests/src/com/android/launcher3/util/BaseLauncherActivityTest.kt
index 6446592..61fa7d5 100644
--- a/tests/src/com/android/launcher3/util/BaseLauncherActivityTest.kt
+++ b/tests/src/com/android/launcher3/util/BaseLauncherActivityTest.kt
@@ -124,9 +124,10 @@
 
     @JvmOverloads
     protected fun injectKeyEvent(keyCode: Int, actionDown: Boolean, metaState: Int = 0) {
+        uiDevice.waitForIdle()
         val eventTime = SystemClock.uptimeMillis()
         val event =
-            KeyEvent.obtain(
+            KeyEvent(
                 eventTime,
                 eventTime,
                 if (actionDown) KeyEvent.ACTION_DOWN else MotionEvent.ACTION_UP,
@@ -137,10 +138,8 @@
                 /* scancode= */ 0,
                 /* flags= */ 0,
                 InputDevice.SOURCE_KEYBOARD,
-                /* characters =*/ null,
             )
         executeOnLauncher { it.dispatchKeyEvent(event) }
-        event.recycle()
     }
 
     @JvmOverloads