From 0063204dbf7acd23e26ce900034e2908ee5acb8a Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Fri, 6 Sep 2019 11:32:56 -0700 Subject: Add nullcheck for VelocityTracker Bug:134712476 Change-Id:I7834507a4e9aadf4d89c0ed6f3eba812df7425cd (cherry picked from commit 6ef5b8abf47fb6782bb1274bca26cf9739d4389f) --- src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java b/src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java index 589ad25e4..06b5c409d 100644 --- a/src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java +++ b/src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java @@ -106,6 +106,7 @@ public class FlingToDeleteHelper { * @return the vector at which the item was flung, or null if no fling was detected. */ private PointF isFlingingToDelete() { + if (mVelocityTracker == null) return null; if (mDropTarget == null) { mDropTarget = (ButtonDropTarget) mLauncher.findViewById(R.id.delete_target_text); } -- cgit v1.2.3