Fixing merge issue with last CL.

Change-Id: I71444dafd11427e47387b0652664be21af0c5651

1 files changed, 9 insertions, 7 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java
index f0b6cbda1954..31ac755007f7 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java
@@ -148,13 +148,15 @@ class RecentsViewTouchHandler {
             }
             case MotionEvent.ACTION_UP:
             case MotionEvent.ACTION_CANCEL: {
-                ReferenceCountedTrigger postAnimationTrigger = new ReferenceCountedTrigger(
-                        mRv.getContext(), null, null, null);
-                postAnimationTrigger.increment();
-                EventBus.getDefault().send(new DragEndEvent(mDragTask, mTaskView, mDragView,
-                        mLastDockState, postAnimationTrigger));
-                postAnimationTrigger.decrement();
-                break;
+                if (mDragging) {
+                    ReferenceCountedTrigger postAnimationTrigger = new ReferenceCountedTrigger(
+                            mRv.getContext(), null, null, null);
+                    postAnimationTrigger.increment();
+                    EventBus.getDefault().send(new DragEndEvent(mDragTask, mTaskView, mDragView,
+                            mLastDockState, postAnimationTrigger));
+                    postAnimationTrigger.decrement();
+                    break;
+                }
             }
         }
     }