commit 7a668168da9962b6a9f408e6f2f7465da1c492ca
author Winson Chung <winsonc@google.com> Tue Apr 20 21:05:05 2021 -0700
committer Winson Chung <winsonc@google.com> Tue Apr 20 21:05:22 2021 -0700
tree 86dc30fedf47fc47cf2262310fb71ea721f6652e
parent 8e64bba9cf5079dadc677d876958afc2f4aea706

Add null check when resetting animation

- resetStateForAnimationCancel() can be called before launcher is present

Bug: 185945504
Test: Manual
Change-Id: I19525b12e8b179103b6081a8aa554dbe2ebc5ba5

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 7599234..1a732f0 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1389,7 +1389,9 @@
         mActivityInterface.onTransitionCancelled(wasVisible);
 
         // Leave the pending invisible flag, as it may be used by wallpaper open animation.
-        mActivity.clearForceInvisibleFlag(INVISIBLE_BY_STATE_HANDLER);
+        if (mActivity != null) {
+            mActivity.clearForceInvisibleFlag(INVISIBLE_BY_STATE_HANDLER);
+        }
     }
 
     protected void switchToScreenshot() {