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

Commit 737c7f21 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix null-pointer in AbsSwipeUpHandler.buildAnimationController" into udc-dev

parents 8ee4ad66 1834581b
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -830,7 +830,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     * @return Whether we can create the launcher controller or update its progress.
     */
    private boolean canCreateNewOrUpdateExistingLauncherTransitionController() {
        return mGestureState.getEndTarget() != HOME && !mHasEndedLauncherTransition;
        return mGestureState.getEndTarget() != HOME
                && !mHasEndedLauncherTransition && mActivity != null;
    }

    @Override