commit d489a4b6e9a9b160e94354ce2b6c6ac0f9c7f3cb
author Winson Chung <winsonc@google.com> Thu Jul 08 21:21:37 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 08 21:21:37 2021 +0000
tree 3957cefba2bde4b9e1d0344e129ef0ca0527b896
parent 7d439991cc7bb9a527ef731c8e825ce7fa3fd89f
parent 255fe1ea45e77e25c9cce86b0999a16e6c8d3b7c

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

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