| commit | 0958bd769ea8ee43c4624f3ae68ffaec711adf91 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Mar 02 20:31:46 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 02 20:31:46 2021 +0000 |
| tree | 3753536c1a71013f08abb9dd093339460f2d2e30 | |
| parent | 01e8cf668b8dad55057d71610cb306aec97204ca [diff] | |
| parent | fe67c6be0b44b284de2d6312f25f6e63763e1ee4 [diff] |
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: If1ad90b7a21afa4ec51f04807abe3f7301568148
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) {