commit 07544cd85f40193dcc5c7f6acbf6d315af30c3f5
author Garfield Tan <xutan@google.com> Wed Sep 12 16:16:54 2018 -0700
committer Garfield Tan <xutan@google.com> Thu Sep 13 14:29:31 2018 -0700
tree 6c53b67e06c27a4baddb3eb72ffc92f9295f86e3
parent c9759f19349d2f5e73e10e82360c0b40b37d1d82

Fix 2 input issues regarding drag-move/drag-resize.

1) Only add InputWindowHandle to target display.
2) Synchronize when releasing input related sources.

Also organized imports.

Bug: 113363194
Test: Drag-move stopped crashing.
Change-Id: I6352d19e195c9173092493a7fd0da140073fd8b9

services/core/java/com/android/server/wm/InputMonitor.java

diff --git a/services/core/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java
index 3309798..ef3a770 100644
--- a/services/core/java/com/android/server/wm/InputMonitor.java
+++ b/services/core/java/com/android/server/wm/InputMonitor.java
@@ -268,11 +268,11 @@
             }
             final InputWindowHandle dragWindowHandle =
                     mService.mDragDropController.getInputWindowHandleLocked();
-            if (dragWindowHandle != null) {
-                addInputWindowHandle(dragWindowHandle);
-            } else {
+            if (dragWindowHandle == null) {
                 Slog.w(TAG_WM, "Drag is in progress but there is no "
                         + "drag window handle.");
+            } else if (dragWindowHandle.displayId == mDisplayId) {
+                addInputWindowHandle(dragWindowHandle);
             }
         }
 
@@ -283,11 +283,11 @@
             }
             final InputWindowHandle dragWindowHandle =
                     mService.mTaskPositioningController.getDragWindowHandleLocked();
-            if (dragWindowHandle != null) {
-                addInputWindowHandle(dragWindowHandle);
-            } else {
+            if (dragWindowHandle == null) {
                 Slog.e(TAG_WM,
                         "Repositioning is in progress but there is no drag window handle.");
+            } else if (dragWindowHandle.displayId == mDisplayId) {
+                addInputWindowHandle(dragWindowHandle);
             }
         }