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

Commit d489a4b6 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

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

parents 7d439991 255fe1ea

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

+5 −2
Original line number Original line Diff line number Diff line
@@ -387,8 +387,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
        mGestureState.runOnceAtState(STATE_RECENTS_ANIMATION_CANCELED, () -> {

        mGestureState.runOnceAtState(STATE_RECENTS_ANIMATION_CANCELED, () -> {

                ThumbnailData snapshot = mGestureState.consumeRecentsAnimationCanceledSnapshot();

                ThumbnailData snapshot = mGestureState.consumeRecentsAnimationCanceledSnapshot();

                if (snapshot != null) {

                if (snapshot != null) {

                    mRecentsView.switchToScreenshot(snapshot,

                    mRecentsView.switchToScreenshot(snapshot, () -> {

                            () -> mRecentsAnimationController.cleanupScreenshot());

                        if (mRecentsAnimationController != null) {

                            mRecentsAnimationController.cleanupScreenshot();

                        }

                    });

                    mRecentsView.onRecentsAnimationComplete();

                    mRecentsView.onRecentsAnimationComplete();

                }

                }

            });

            });