commit 585bc6638380ce3b0f430483a1d11de0ea69fca3
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue May 16 17:52:00 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 16 17:52:00 2023 +0000
tree 6349a45e9ab9c07b4b8335e2c0bf8fddac52d13e
parent 0987fd8824d38e8bb4642fec705842a1c27bace8
parent 70c6ee8fff6c40fa78d4cff5643c6156d99b764f

Merge "Set cursor position to the first pointer for mouse events" into udc-dev

services/inputflinger/tests/InputDispatcher_test.cpp

diff --git a/services/inputflinger/tests/InputDispatcher_test.cpp b/services/inputflinger/tests/InputDispatcher_test.cpp
index fecd0d1..3f2658a 100644
--- a/services/inputflinger/tests/InputDispatcher_test.cpp
+++ b/services/inputflinger/tests/InputDispatcher_test.cpp
@@ -1564,8 +1564,7 @@
 
         // Set mouse cursor position for the most common cases to avoid boilerplate.
         if (mSource == AINPUT_SOURCE_MOUSE &&
-            !MotionEvent::isValidCursorPosition(mRawXCursorPosition, mRawYCursorPosition) &&
-            mPointers.size() == 1) {
+            !MotionEvent::isValidCursorPosition(mRawXCursorPosition, mRawYCursorPosition)) {
             mRawXCursorPosition = pointerCoords[0].getX();
             mRawYCursorPosition = pointerCoords[0].getY();
         }
@@ -1677,8 +1676,7 @@
 
         // Set mouse cursor position for the most common cases to avoid boilerplate.
         if (mSource == AINPUT_SOURCE_MOUSE &&
-            !MotionEvent::isValidCursorPosition(mRawXCursorPosition, mRawYCursorPosition) &&
-            mPointers.size() == 1) {
+            !MotionEvent::isValidCursorPosition(mRawXCursorPosition, mRawYCursorPosition)) {
             mRawXCursorPosition = pointerCoords[0].getX();
             mRawYCursorPosition = pointerCoords[0].getY();
         }