[ProgressIndicator] Fixed NPE while setting progress in the indetermi…

…nate mode after inflation. PiperOrigin-RevId: 351656379 (cherry picked from commit 7a9e3f6)
material-components · Jan 14, 2021 · c78c1ef · c78c1ef
1 parent e9fcdf0
commit c78c1ef
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/java/com/google/android/material/progressindicator/BaseProgressIndicator.java b/lib/java/com/google/android/material/progressindicator/BaseProgressIndicator.java
@@ -721,9 +721,10 @@ public void setProgressCompat(int progress, boolean animated) {
         storedProgressAnimated = animated;
         isIndeterminateModeChangeRequested = true;
 
-        if (animatorDurationScaleProvider.getSystemAnimatorDurationScale(
-                getContext().getContentResolver())
-            == 0) {
+        if (!getIndeterminateDrawable().isVisible()
+            || animatorDurationScaleProvider.getSystemAnimatorDurationScale(
+                    getContext().getContentResolver())
+                == 0) {
           switchIndeterminateModeCallback.onAnimationEnd(getIndeterminateDrawable());
         } else {
           getIndeterminateDrawable().getAnimatorDelegate().requestCancelAnimatorAfterCurrentCycle();