From 1f285a594a7ceccd2fbca011b96bd093da1dd179 Mon Sep 17 00:00:00 2001
From: Becky Qiu <xuqiu@google.com>
Date: Fri, 6 May 2022 16:22:50 -0700
Subject: [PATCH] Fix the IndexOutOfBoundsException in AllAppsGridAdapter.

Bug: 231552223
Test: no need to test
Change-Id: I2d32f0ca973e6e9d5e97d9c69b5c76d26d91c254
---
 src/com/android/launcher3/allapps/AllAppsGridAdapter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 58df50ca82..33d2f2b1df 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -118,7 +118,7 @@ public class AllAppsGridAdapter<T extends Context & ActivityContext> extends
             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++;
                 }