commit 639a0103e0073e19c5d62c7df5104b40d167efab
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 02 20:37:40 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 02 20:37:40 2021 +0000
tree 84518c276b2ad96101b0aee8370e81440e1b52e8
parent f425de33ace1efa92e0c3dcdb907ed84bb1872bc
parent fe67c6be0b44b284de2d6312f25f6e63763e1ee4

Merge "Fix NPE in FlingToDeleteHelper" into sc-dev am: fe67c6be0b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13741294

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied20b0565837c924bbfa1a4eab496d0a48c5f3f1

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