| commit | cb76f90af80e2b28ccb05cda0e6934f310411d16 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Sat Jul 03 03:59:40 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jul 03 03:59:40 2021 +0000 |
| tree | 703c410de14b944b87d2b0e6a1305a27e738eb33 | |
| parent | 40f6c2ed9fdb6ef69ef319462d58fb6786bf136e [diff] | |
| parent | 3ab305e759e4d0cc100b62d54b324ccc867716fe [diff] |
Merge "Fix crash when handling recents animation canceled" into sc-dev am: a82403ab09 am: 3ab305e759 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15192339 Change-Id: If326462ddbc354cbce06da27dddcfd56943d9f04
diff --git a/quickstep/src/com/android/quickstep/GestureState.java b/quickstep/src/com/android/quickstep/GestureState.java index 015002f..e3ae361 100644 --- a/quickstep/src/com/android/quickstep/GestureState.java +++ b/quickstep/src/com/android/quickstep/GestureState.java
@@ -364,7 +364,9 @@ mStateCallback.setState(STATE_RECENTS_ANIMATION_ENDED); if (mRecentsAnimationCanceledSnapshot != null) { // Clean up the screenshot to finalize the recents animation cancel - mRecentsAnimationController.cleanupScreenshot(); + if (mRecentsAnimationController != null) { + mRecentsAnimationController.cleanupScreenshot(); + } mRecentsAnimationCanceledSnapshot = null; } }