commit 9b6c58e6a9055898b645b924adafc5fbde4b97df
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Dec 13 11:59:41 2024 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 13 11:59:41 2024 -0800
tree 8e5c89ea16b8757b2d658b4c2b82f15fb5d255f5
parent 6f3213b260ae3aa7c2211c11cbedf327629d9478
parent 8cf0df7f9673fd35cf71a6c8e2c6d67d1618a40d

Merge "Do not rely on `getTaskViewCount` to iterate TaskViews" into main

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

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 285849d..30052c7 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -6177,10 +6177,12 @@
             }
         }
 
-        final int taskCount = getTaskViewCount();
         int lastTaskScroll = getLastTaskScroll(clearAllScroll, clearAllWidth);
-        for (int i = 0; i < taskCount; i++) {
-            TaskView taskView = requireTaskViewAt(i);
+        for (int i = 0; i < getChildCount(); i++) {
+            TaskView taskView = getTaskViewAt(i);
+            if (taskView == null) {
+                continue;
+            }
             float scrollDiff = taskView.getScrollAdjustment(showAsGrid);
             int pageScroll = newPageScrolls[i] + Math.round(scrollDiff);
             if ((mIsRtl && pageScroll < lastTaskScroll)