commit 255fe1ea45e77e25c9cce86b0999a16e6c8d3b7c
author Winson Chung <winsonc@google.com> Thu Jul 08 10:12:34 2021 -0700
committer Winson Chung <winsonc@google.com> Thu Jul 08 10:12:34 2021 -0700
tree 2dcedb0a73dc94770d05936573155e1751d3a71d
parent a82403ab09350211fc3703d3874aedc1fa280012

Fix crash when handling recents animation canceled

- If Launcher finishes the animation, that also cleans up the screenshot
    on the server side, so we can skip calling it

Fixes: 192684578
Test: N/a, adding a null check
Change-Id: I8bf1ad5089762469697d14842cc14c184055e925

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