commit 96a1557c95545e5b466f1562ae77a63b299cf55d
author Siarhei Vishniakou <svv@google.com> Mon Dec 18 10:47:52 2023 -0800
committer Siarhei Vishniakou <svv@google.com> Mon Dec 18 10:57:12 2023 -0800
tree 3c29877469f4e1d12c471f5a319fa4ea7dfc19c4
parent 4191ac8e0e6cfd16f8bc41c2b2ad714df39ef6dc

Fix event stream in DragAndDropNotCancelledIfSomeOtherPointerIsPilfered

Before this CL, this test injected two POINTER_1_DOWN events in a row,
which is incorrect.

Fix this by sending the ACTION_MOVE event for the last injection.

Bug: 316915830
Test: add fatal log locally on double pointer add and then run the tests
Test: TEST=inputflinger_tests; m $TEST && $ANDROID_HOST_OUT/nativetest64/$TEST/$TEST
Change-Id: If47ad8cd3e43f4b4d36eec20e5de4df3a6d142c5

services/inputflinger/tests/InputDispatcher_test.cpp

diff --git a/services/inputflinger/tests/InputDispatcher_test.cpp b/services/inputflinger/tests/InputDispatcher_test.cpp
index 62b7c18..9394995 100644
--- a/services/inputflinger/tests/InputDispatcher_test.cpp
+++ b/services/inputflinger/tests/InputDispatcher_test.cpp
@@ -9702,13 +9702,13 @@
     mDragWindow->assertNoEvents();
 
     const MotionEvent firstFingerMoveEvent =
-            MotionEventBuilder(POINTER_1_DOWN, AINPUT_SOURCE_TOUCHSCREEN)
+            MotionEventBuilder(ACTION_MOVE, AINPUT_SOURCE_TOUCHSCREEN)
                     .eventTime(systemTime(SYSTEM_TIME_MONOTONIC))
                     .pointer(PointerBuilder(/*id=*/0, ToolType::FINGER).x(60).y(60))
                     .pointer(PointerBuilder(/*id=*/1, ToolType::FINGER).x(60).y(60))
                     .build();
     ASSERT_EQ(InputEventInjectionResult::SUCCEEDED,
-              injectMotionEvent(*mDispatcher, secondFingerDownEvent, INJECT_EVENT_TIMEOUT,
+              injectMotionEvent(*mDispatcher, firstFingerMoveEvent, INJECT_EVENT_TIMEOUT,
                                 InputEventInjectionSync::WAIT_FOR_RESULT))
             << "Inject motion event should return InputEventInjectionResult::SUCCEEDED";