commit 3915c1fe6ad6378c432adee2b5b05d1e597e9f4d
author Arthur Hung <arthurhung@google.com> Tue May 31 07:17:17 2022 +0000
committer Arthur Hung <arthurhung@google.com> Thu Jun 02 03:41:22 2022 +0000
tree 8988fbb1fc7ce5101edaa375ab19ea8f0b55a302
parent a4b0d8af289c5f2e911b5d5f15a8e92650b0c54e

Fix drag surface may stuck in multi displays

Check the displayId to prevent the drag state could be reset due to
update input windows of another display or event from another display.

Test: atest inputflinger_tests
Bug: 234405420
Change-Id: I75c7e08594f4dd08b6a0103c2c5a54d8f3e3e09e

services/inputflinger/dispatcher/InputDispatcher.cpp

diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index 4d25c59..5e9427a 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -2507,7 +2507,7 @@
 }
 
 void InputDispatcher::addDragEventLocked(const MotionEntry& entry) {
-    if (!mDragState) {
+    if (!mDragState || mDragState->dragWindow->getInfo()->displayId != entry.displayId) {
         return;
     }
 
@@ -4765,9 +4765,11 @@
 
         // If drag window is gone, it would receive a cancel event and broadcast the DRAG_END. We
         // could just clear the state here.
-        if (mDragState &&
+        if (mDragState && mDragState->dragWindow->getInfo()->displayId == displayId &&
             std::find(windowHandles.begin(), windowHandles.end(), mDragState->dragWindow) ==
                     windowHandles.end()) {
+            ALOGI("Drag window went away: %s", mDragState->dragWindow->getName().c_str());
+            sendDropWindowCommandLocked(nullptr, 0, 0);
             mDragState.reset();
         }
     }