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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15192339 Change-Id: Id4eb3b055b9cd640e879a58479b5a9d2bf5eeb12
2021-07-03 03:42:32 +00:00
parent 3f28283be1 a82403ab09
commit b8e2ba9203
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;
        }
    }