Merge "Fix crash when handling recents animation canceled" into sc-dev am: a82403ab09 am: 3ab305e759

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15192339 Change-Id: If326462ddbc354cbce06da27dddcfd56943d9f04
2021-07-03 03:59:40 +00:00
parent 40f6c2ed9f 3ab305e759
commit cb76f90af8
1 changed files with 3 additions and 1 deletions
@@ -364,7 +364,9 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
        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;
        }
    }