| commit | d022503542cea3433b2fe5b7dd2ec04696bcd310 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Thu Apr 22 22:21:30 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 22:21:30 2021 +0000 |
| tree | 3dff322e23711cd4b0259ae1c2ebec8c33a1502b | |
| parent | 168e9851d758036e25d35c2e904b662545823153 [diff] | |
| parent | b2a72da3350c81258b1e80861469f07643ed16b7 [diff] |
Merge "Add null check when resetting animation" into sc-dev am: b2a72da335 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14258842 Change-Id: Ied0265f41379abe4777ffffcbf9ea427c3cf5d6f
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() {