commit 1fe0a4e08031021f4191f90caf527f39705d1724
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 15 21:41:34 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 15 21:41:34 2020 +0000
tree a430434aa8572f3baf78fcc9e90e0559d84c9267
parent ac9cf4771282b856fa8041a81614c9ab8c0c797d
parent cfb803c42c73db8c7319b225922fa9df5f07fe50

Merge "Address race condition with drag from external window" into ub-launcher3-rvc-dev

src/com/android/launcher3/dragndrop/BaseItemDragListener.java

diff --git a/src/com/android/launcher3/dragndrop/BaseItemDragListener.java b/src/com/android/launcher3/dragndrop/BaseItemDragListener.java
index 9b91a1d..e47a16f 100644
--- a/src/com/android/launcher3/dragndrop/BaseItemDragListener.java
+++ b/src/com/android/launcher3/dragndrop/BaseItemDragListener.java
@@ -92,7 +92,7 @@
             postCleanup();
             return false;
         }
-        if (event.getAction() == DragEvent.ACTION_DRAG_STARTED) {
+        if (event.getAction() == DragEvent.ACTION_DRAG_STARTED || !mDragController.isDragging()) {
             if (onDragStart(event)) {
                 return true;
             } else {