Merge "Fix drag and drop and resize freeform window broken on secondary display" into tm-dev am: d9543bc701 am: 0e2943e397

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18659181

Change-Id: I9712d721a4e16a9639a7042e5b0cb81215a49b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -165,6 +165,7 @@ class DragState {
                     .setContainerLayer()
                     .setName("Drag and Drop Input Consumer")
                     .setCallsite("DragState.showInputSurface")
+                    .setParent(mDisplayContent.getOverlayLayer())
                     .build();
         }
         final InputWindowHandle h = getInputWindowHandle();

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

@@ -73,6 +73,7 @@ class TaskPositioningController {
                     .setContainerLayer()
                     .setName("Drag and Drop Input Consumer")
                     .setCallsite("TaskPositioningController.showInputSurface")
+                    .setParent(dc.getOverlayLayer())
                     .build();
         }