| commit | 91ed1021c1b483501b154954cf99c65b600d1ec3 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Fri Sep 09 16:24:55 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 09 16:24:55 2022 +0000 |
| tree | 87a657e6d813c8617de96369514b3d2210902e2a | |
| parent | 1d513c9059deb31fff049d32469c6ceacb7be6b0 [diff] | |
| parent | 315959c6b8a954ab50ede10bd26c5a68788a2c48 [diff] |
Merge "Fix issue with drags sometimes not being handled in tests" into tm-qpr-dev am: 315959c6b8 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19904952 Change-Id: Ia70095adb4302755b96fde3bfe8a7f17675f0cc6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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: {