commit a512a53e89c79ed5c5a18fab0fb1a0ae2949ad74
author Linnan Li <lilinnan@xiaomi.corp-partner.google.com> Tue Oct 08 16:19:16 2024 +0800
committer Linnan Li <lilinnan@xiaomi.corp-partner.google.com> Wed Oct 09 06:59:13 2024 +0000
tree d76d73234903bb4e184894511b19317a5f105279
parent a75d99da27268b3b8787d35d485a8539770671f5

Check the DeviceId for generating DragEvent

After introducing multi-device event stream handling in the Dispatcher,
the drag-and-drop logic was not compatible, leading to unexpected
crashes. This is being fixed here.

Bug: 372165513
Test: atest inputflinger_tests
Flag: EXEMPT bugfix

Change-Id: If5dee9023821a386265651bfdbe9c25d04cd5136
Signed-off-by: Linnan Li <lilinnan@xiaomi.corp-partner.google.com>

services/inputflinger/dispatcher/InputDispatcher.cpp

diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index f9fbfef..2161e09 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -2870,7 +2870,8 @@
 }
 
 void InputDispatcher::addDragEventLocked(const MotionEntry& entry) {
-    if (!mDragState || mDragState->dragWindow->getInfo()->displayId != entry.displayId) {
+    if (!mDragState || mDragState->dragWindow->getInfo()->displayId != entry.displayId ||
+        mDragState->deviceId != entry.deviceId) {
         return;
     }
 
@@ -5758,7 +5759,7 @@
             }
             // Track the pointer id for drag window and generate the drag state.
             const size_t id = pointers.begin()->id;
-            mDragState = std::make_unique<DragState>(toWindowHandle, id);
+            mDragState = std::make_unique<DragState>(toWindowHandle, deviceId, id);
         }
 
         // Synthesize cancel for old window and down for new window.