commit 7199acdbad4fd7f973f5733b3473e74a12867f84
author Tony Wickham <twickham@google.com> Mon Nov 23 16:09:07 2020 -0800
committer Tony Wickham <twickham@google.com> Mon Nov 23 16:09:07 2020 -0800
tree 081913141d621c1518a76264e169582979655388
parent 64594c803a24dcd3ac57e2ddf077ebfc5c8fc3c9

Add null check to AbstractStateChangeTouchController#onDragEnd()

Fixes: 171444185
Change-Id: I32eec545c849164463e2820603bfb6dc26260f11

src/com/android/launcher3/touch/AbstractStateChangeTouchController.java

diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index a9d0e61..7c02f3d 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -396,6 +396,12 @@
 
     @Override
     public void onDragEnd(float velocity) {
+        if (mCurrentAnimation == null) {
+            // Unlikely, but we may have been canceled just before onDragEnd(). We assume whoever
+            // canceled us will handle a new state transition to clean up.
+            return;
+        }
+
         boolean fling = mDetector.isFling(velocity);
 
         boolean blockedFling = fling && mFlingBlockCheck.isBlocked();