commit 3e9d510586b8e5aa7d8786d2884a0d1e5c08569c
author Daichi Hirono <hirono@google.com> Mon Apr 15 15:58:11 2019 +0900
committer Daichi Hirono <hirono@google.com> Fri Apr 19 02:30:06 2019 +0000
tree 2dfbf7d5236e6163e5f7c93fcc8beadd2276ff47
parent 7deafd415b1f32a9e9c8315ddf7938d2d7ae0c2c

Add a flag to cancelDragAndDrop to skip animation

When running cancel animation for drag shadow image, the system cannot
start another drag operation, which is problematic when the system would
start the other drag operation quickly.

Bug: 130313958
Test: Cancel drag operation by calling cancelDragAndDrop
Change-Id: I5d6650a0ce9a4cd80bbdb1beabc9e514349ccadc

services/core/java/com/android/server/wm/DragDropController.java

diff --git a/services/core/java/com/android/server/wm/DragDropController.java b/services/core/java/com/android/server/wm/DragDropController.java
index 716e4ef..f8f6334 100644
--- a/services/core/java/com/android/server/wm/DragDropController.java
+++ b/services/core/java/com/android/server/wm/DragDropController.java
@@ -236,7 +236,7 @@
         }
     }
 
-    void cancelDragAndDrop(IBinder dragToken) {
+    void cancelDragAndDrop(IBinder dragToken, boolean skipAnimation) {
         if (DEBUG_DRAG) {
             Slog.d(TAG_WM, "cancelDragAndDrop");
         }
@@ -257,7 +257,7 @@
                 }
 
                 mDragState.mDragResult = false;
-                mDragState.cancelDragLocked();
+                mDragState.cancelDragLocked(skipAnimation);
             }
         } finally {
             mCallback.get().postCancelDragAndDrop();