| commit | 3ab305e759e4d0cc100b62d54b324ccc867716fe | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Sat Jul 03 03:43:07 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jul 03 03:43:07 2021 +0000 |
| tree | c9849af13ab8b005855a539912570d6f38914dcb | |
| parent | 6a31100429298d2e7a8cfc752b5aba4223786c7d [diff] | |
| parent | a82403ab09350211fc3703d3874aedc1fa280012 [diff] |
Merge "Fix crash when handling recents animation canceled" into sc-dev am: a82403ab09 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15192339 Change-Id: Id8f402766124ecbb648d81527124e41495e182b5
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; } }