commit ceedb947657416f774f35af0a8420be0d8b88a3f
author Winson Chung <winsonc@google.com> Thu Jul 08 21:35:08 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 08 21:35:08 2021 +0000
tree 431401972050d049c06a2a362b4635169a19c068
parent 8fb5a9fc48f9a5f1536fde3ed51076de03bee1f3
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: I8e5ac504960a690a32c9415f0b8ae8ef8bc909c0

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 e867f07..7e45369 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();
                 }
             });