commit 2839c20c1ae976a1a90a6dcc2f46a0eba53fde5f
author Jon Miranda <jonmiranda@google.com> Tue Mar 02 12:01:03 2021 -0500
committer Jon Miranda <jonmiranda@google.com> Tue Mar 02 12:01:03 2021 -0500
tree 6631c01463f4f220a6c738b7d6a16d18536dfd26
parent 13d5079e90712d06ea53b7480d6a920114c795c0

Fix NPE in FlingToDeleteHelper

Bug: 171543835
Test: not able to repo bug, but this prevents the NPE
Change-Id: I153dd0665705b2f5fd7f46786e815ba57dec4720

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

diff --git a/src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java b/src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java
index 7788f93..0a1aba1 100644
--- a/src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java
+++ b/src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java
@@ -65,6 +65,9 @@
     }
 
     public Runnable getFlingAnimation(DropTarget.DragObject dragObject, DragOptions options) {
+        if (options == null) {
+            return null;
+        }
         PointF vel = isFlingingToDelete();
         options.isFlingToDelete = vel != null;
         if (!options.isFlingToDelete) {