commit 32d1ad9e285ed8a9d7ce8cd7ed7600cf6b22cf66
author Winson Chung <winsonc@google.com> Fri Sep 09 16:41:46 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 09 16:41:46 2022 +0000
tree 89eae49c26976bff8d4d53a2d804fd91c743d744
parent a7c7ea33704168735189cf0d465a1c159cc2487f
parent 91ed1021c1b483501b154954cf99c65b600d1ec3

Merge "Fix issue with drags sometimes not being handled in tests" into tm-qpr-dev am: 315959c6b8 am: 91ed1021c1

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

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

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: {