commit 5f306f97f2f524bbed912e413b504e6c5a2d2462
author Winson Chung <winsonc@google.com> Thu Jul 08 21:35:57 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 08 21:35:57 2021 +0000
tree d307b3d6b892bd5153b16260bac2700948b08d1f
parent 4b0ef07f7acd064945edf34473b1f73000727ad4
parent d489a4b6e9a9b160e94354ce2b6c6ac0f9c7f3cb

Merge "Fix crash when handling recents animation canceled" into sc-dev am: d489a4b6e9

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15236027

Change-Id: If65c9b5f4822bed2dbb63f0aa9f34ae7e2e3a922

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 c04d15f..272724e 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -387,8 +387,11 @@
         mGestureState.runOnceAtState(STATE_RECENTS_ANIMATION_CANCELED, () -> {
                 ThumbnailData snapshot = mGestureState.consumeRecentsAnimationCanceledSnapshot();
                 if (snapshot != null) {
-                    mRecentsView.switchToScreenshot(snapshot,
-                            () -> mRecentsAnimationController.cleanupScreenshot());
+                    mRecentsView.switchToScreenshot(snapshot, () -> {
+                        if (mRecentsAnimationController != null) {
+                            mRecentsAnimationController.cleanupScreenshot();
+                        }
+                    });
                     mRecentsView.onRecentsAnimationComplete();
                 }
             });