commit b2a72da3350c81258b1e80861469f07643ed16b7
author Winson Chung <winsonc@google.com> Thu Apr 22 22:09:07 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 22 22:09:07 2021 +0000
tree 3ca0c07e67b21ba73fab767cb7d555a2425e7195
parent 2e17bbae0d67b3cd5673146505a63c6fa667a6a6
parent 7a668168da9962b6a9f408e6f2f7465da1c492ca

Merge "Add null check when resetting animation" into sc-dev

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 dbb8272..9e29d49 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1395,7 +1395,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() {