commit fe67c6be0b44b284de2d6312f25f6e63763e1ee4
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 02 20:00:53 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 02 20:00:53 2021 +0000
tree 84518c276b2ad96101b0aee8370e81440e1b52e8
parent a9bb9394a51524f315b0464d2ac32bcbf44eec50
parent 2839c20c1ae976a1a90a6dcc2f46a0eba53fde5f

Merge "Fix NPE in FlingToDeleteHelper" into sc-dev

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) {