Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f306f97 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15236027

Change-Id: If65c9b5f4822bed2dbb63f0aa9f34ae7e2e3a922
parents 4b0ef07f d489a4b6

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+5 −2
Original line number Diff line number Diff line
@@ -387,8 +387,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
        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();

                }

            });