commit ebcff1447e0d3c6b8137286bf8a62ad7708b1cbb
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 15 21:53:16 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 15 21:53:16 2020 +0000
tree 24488b2d6e81f46ae5da98d57564a6080f7a49be
parent 643427383400980493031bcf36184abd6f63a71c
parent 1fe0a4e08031021f4191f90caf527f39705d1724

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

Change-Id: I16c1d400c42a7c99d7c7ee307ae3f90bfc43d181

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 {