| commit | b8e2ba92035731fa9047629c2e74e035e4a5207f | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Sat Jul 03 03:42:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jul 03 03:42:32 2021 +0000 |
| tree | 9d3572c37252b509ac4e9f0c3044af0c1477b390 | |
| parent | 3f28283be116fb97b4bc9d9ee4cdcccfec4cd6f5 [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: Id4eb3b055b9cd640e879a58479b5a9d2bf5eeb12
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; } }