commit 713bb3e589cc4b61e7ad1360fe523c580629618b
author Prabir Pradhan <prabirmsp@google.com> Mon Dec 20 02:07:40 2021 -0800
committer Prabir Pradhan <prabirmsp@google.com> Tue Dec 21 02:21:08 2021 -0800
tree c65a0798446a94aa30be1ae5d6e67aa2ba8a706c
parent 3f90d316097e656175cb4af29e8e550a303a7e41

InputDispatcher: Don't split mouse events

Events coming from a mouse should never be split, and should always be
dispatched to the mouse cursor position, even if it has muliple
pointers.

Bug: None
Test: atest inputflinger_tests
Change-Id: I53c7d59df54eabf89017c4a4e39a26e81951c344

services/inputflinger/dispatcher/InputDispatcher.cpp

diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index d6ae3cd..f50c9e1 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -2064,8 +2064,9 @@
             }
         } else {
             // No window is touched, so set split to true. This will allow the next pointer down to
-            // be delivered to a new window which supports split touch.
-            tempTouchState.split = isSplit = true;
+            // be delivered to a new window which supports split touch. Pointers from a mouse device
+            // should never be split.
+            tempTouchState.split = isSplit = !isFromMouse;
         }
 
         // Update hover state.
@@ -2211,7 +2212,7 @@
 
                 // Make a slippery entrance into the new window.
                 if (newTouchedWindowHandle->getInfo()->supportsSplitTouch()) {
-                    isSplit = true;
+                    isSplit = !isFromMouse;
                 }
 
                 int32_t targetFlags =