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

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

Merge "Fix NPEs when swiping up from keyguard" into sc-v2-dev

parents e34c2f82 b922452b

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

+3 −1
Original line number Diff line number Diff line
@@ -805,7 +805,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
        mActivityInitListener.unregister();

        mStateCallback.setStateOnUiThread(STATE_GESTURE_CANCELLED | STATE_HANDLER_INVALIDATED);



        if (mRecentsAnimationTargets != null) {

            TaskViewUtils.setDividerBarShown(mRecentsAnimationTargets.nonApps, true);

        }



        // Defer clearing the controller and the targets until after we've updated the state

        mRecentsAnimationController = null;

quickstep/src/com/android/quickstep/views/RecentsView.java

+3 −1
Original line number Diff line number Diff line
@@ -1351,9 +1351,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
                }

                Log.d(TASK_VIEW_ID_CRASH, "taskViewCount: " + getTaskViewCount()

                        + " " + sb.toString());

            }

                mRunningTaskViewId = -1;

            } else {

                mRunningTaskViewId = newRunningTaskView.getTaskViewId();

            }

        }



        if (mNextPage == INVALID_PAGE) {

            // Set the current page to the running task, but not if settling on new task.