commit 315959c6b8a954ab50ede10bd26c5a68788a2c48
author Winson Chung <winsonc@google.com> Fri Sep 09 16:15:53 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 09 16:15:53 2022 +0000
tree 0cb884569a331dfcd9641e0ab393ed726218aee5
parent f8f1306eb86e948741741366d7a8b5c7e9e75d2e
parent 92c998a9fa0c49ba3371eb92b207f17a7ca0686e

Merge "Fix issue with drags sometimes not being handled in tests" into tm-qpr-dev

libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropController.java

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropController.java
index 4697a01..b59fe18 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropController.java
@@ -258,12 +258,12 @@
                 break;
             case ACTION_DRAG_ENTERED:
                 pd.dragLayout.show();
-                pd.dragLayout.update(event);
                 break;
             case ACTION_DRAG_LOCATION:
                 pd.dragLayout.update(event);
                 break;
             case ACTION_DROP: {
+                pd.dragLayout.update(event);
                 return handleDrop(event, pd);
             }
             case ACTION_DRAG_EXITED: {