commit 05eac3ee272ef880fd64db2ef097177b690359a1
author Becky Qiu <xuqiu@google.com> Tue May 10 17:27:31 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 10 17:27:31 2022 +0000
tree c657ad021fc3515fffe010bf5a9f014d0b5d9760
parent 8ca6e815bd8370987b431552ccf11c817cfcab06
parent 1f285a594a7ceccd2fbca011b96bd093da1dd179

Merge "Fix the IndexOutOfBoundsException in AllAppsGridAdapter." into tm-dev

src/com/android/launcher3/allapps/AllAppsGridAdapter.java

diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 58df50c..33d2f2b 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -118,7 +118,7 @@
             List<AdapterItem> items = mApps.getAdapterItems();
             adapterPosition = Math.max(adapterPosition, items.size() - 1);
             int extraRows = 0;
-            for (int i = 0; i <= adapterPosition; i++) {
+            for (int i = 0; i <= adapterPosition && i < items.size(); i++) {
                 if (!isViewType(items.get(i).viewType, VIEW_TYPE_MASK_ICON)) {
                     extraRows++;
                 }