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

Commit 0c338f30 authored by Eghosa Ewansiha-Vlachavas's avatar Eghosa Ewansiha-Vlachavas Committed by Android (Google) Code Review
Browse files

Merge "Check RecentsView is not null before use in AbsSwipeUpHandler" into main

parents 093ef5fa 47e0a61f

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

+6 −4
Original line number Diff line number Diff line
@@ -1254,10 +1254,12 @@ public abstract class AbsSwipeUpHandler<T extends RecentsViewContainer, 
            return LAST_TASK;

        }



        if (((mRecentsView.getNextPageTaskView() != null

                && mRecentsView.getNextPageTaskView().isDesktopTask())

                || (mRecentsView.getCurrentPageTaskView() != null

                && mRecentsView.getCurrentPageTaskView().isDesktopTask()))

        TaskView nextPageTaskView = mRecentsView != null

                ? mRecentsView.getNextPageTaskView() : null;

        TaskView currentPageTaskView = mRecentsView != null

                ? mRecentsView.getCurrentPageTaskView() : null;

        if (((nextPageTaskView != null && nextPageTaskView.isDesktopTask())

                || (currentPageTaskView != null && currentPageTaskView.isDesktopTask()))

                && endTarget == NEW_TASK) {

            // TODO(b/268075592): add support for quickswitch to/from desktop

            return LAST_TASK;