commit c936fe1146fcbcd766e871a57f6ef520135e4f69
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 10 21:51:45 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 10 21:51:45 2020 +0000
tree 3bddd5a761786caabbc1cc94117b6f6ae0da6d9e
parent 16823c2c03e226bc910e87b050ea67a30bda8aa8
parent 779955390ca635db90185af573897c5235678f6b

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

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.