diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 3f212c6b80..9cf76b378a 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -107,6 +107,7 @@ import android.widget.ListView; import android.widget.OverScroller; import android.widget.Toast; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; import androidx.core.graphics.ColorUtils; @@ -181,6 +182,7 @@ import com.android.wm.shell.pip.IPipAnimationListener; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Objects; import java.util.function.Consumer; /** @@ -822,7 +824,7 @@ public abstract class RecentsView 0) { - targetPage = indexOfChild(getTaskViewAt(0)); + targetPage = indexOfChild(requireTaskViewAt(0)); } } else if (currentTaskId != -1) { currentTaskView = getTaskViewByTaskId(currentTaskId); @@ -1452,7 +1454,7 @@ public abstract class RecentsView= 0; i--) { - removeView(getTaskViewAt(i)); + removeView(requireTaskViewAt(i)); } if (indexOfChild(mClearAllButton) != -1) { removeView(mClearAllButton); @@ -1498,7 +1500,7 @@ public abstract class RecentsView= 0; i--) { - TaskView taskView = getTaskViewAt(i); + TaskView taskView = requireTaskViewAt(i); if (mIgnoreResetTaskId != taskView.getTaskIds()[0]) { taskView.resetViewTransforms(); taskView.setIconScaleAndDim(mTaskIconScaledDown ? 0 : 1); @@ -1539,7 +1541,7 @@ public abstract class RecentsView 0 && mTopRowIdSet.size() >= (taskCount - 1) / 2f; // Pick the next focused task from the preferred row. for (int i = 0; i < taskCount; i++) { - TaskView taskView = getTaskViewAt(i); + TaskView taskView = requireTaskViewAt(i); if (taskView == dismissedTaskView) { continue; } @@ -2826,7 +2828,7 @@ public abstract class RecentsView= 0; i--) { - TaskView child = getTaskViewAt(i); + TaskView child = requireTaskViewAt(i); int[] childTaskIds = child.getTaskIds(); if (!mRunningTaskTileHidden || (childTaskIds[0] != runningTaskId && childTaskIds[1] != runningTaskId)) { @@ -3553,6 +3555,14 @@ public abstract class RecentsView 0) { - final View taskView = getTaskViewAt(0); - getTaskViewAt(count - 1).getHitRect(mTaskViewDeadZoneRect); + final View taskView = requireTaskViewAt(0); + requireTaskViewAt(count - 1).getHitRect(mTaskViewDeadZoneRect); mTaskViewDeadZoneRect.union(taskView.getLeft(), taskView.getTop(), taskView.getRight(), taskView.getBottom()); } @@ -4559,7 +4569,7 @@ public abstract class RecentsView