commit 892dd29230ed474139e1a5f5f4c4382cf1716083
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 10 22:06:46 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 10 22:06:46 2020 +0000
tree 0185be4da56a498499897916512509147bdccb4c
parent d0e98a1f7b1e6fef5976cccd4bf926d9635df30d
parent c936fe1146fcbcd766e871a57f6ef520135e4f69

Merge "Add null check before updating animation progress" into ub-launcher3-rvc-dev am: c936fe1146

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

Change-Id: I96294f04d493fb316d091ba8cd8fa51456c9bec5

src/com/android/launcher3/touch/AbstractStateChangeTouchController.java

diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 2c21609..171c5ee 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -310,6 +310,9 @@
     }
 
     protected void updateProgress(float fraction) {
+        if (mCurrentAnimation == null) {
+            return;
+        }
         mCurrentAnimation.setPlayFraction(fraction);
         if (mAtomicComponentsController != null) {
             // Make sure we don't divide by 0, and have at least a small runway.