| commit | bea7f71e8fc7283bd4c074410c152aeb3b3fd7be | [log] [tgz] |
|---|---|---|
| author | Becky Qiu <xuqiu@google.com> | Tue May 10 21:27:10 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 10 21:27:10 2022 +0000 |
| tree | 8176737c74a0f1750d72b594554515996abe0d4f | |
| parent | b461896e90b67e46ba0d9ff27fa179c722901425 [diff] | |
| parent | 3229ecc69b3870021d0f2f0c280965ae479187f2 [diff] |
Merge "Fix the IndexOutOfBoundsException in AllAppsGridAdapter." into tm-dev am: 05eac3ee27 am: 3229ecc69b Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206586 Change-Id: I910863d77baa38cd12aa7043234907abadcf7b1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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++; }