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

Commit ca648034 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Add null check on mRecentsView in the InputConsumerProxy" into tm-qpr-dev

parents 0c8ceda6 ce563b6b

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

+6 −3
Original line number Diff line number Diff line
@@ -297,9 +297,12 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
        mActivityInterface = gestureState.getActivityInterface();

        mActivityInitListener = mActivityInterface.createActivityInitListener(this::onActivityInit);

        mInputConsumerProxy =

                new InputConsumerProxy(context,

                        () -> mRecentsView.getPagedViewOrientedState().getRecentsActivityRotation(),

                        inputConsumer, () -> {

                new InputConsumerProxy(context, /* rotationSupplier = */ () -> {

                    if (mRecentsView == null) {

                        return ROTATION_0;

                    }

                    return mRecentsView.getPagedViewOrientedState().getRecentsActivityRotation();

                }, inputConsumer, /* callback = */ () -> {

                    endRunningWindowAnim(mGestureState.getEndTarget() == HOME /* cancel */);

                    endLauncherTransitionController();

                }, new InputProxyHandlerFactory(mActivityInterface, mGestureState));