Merge "Fix IndexOutOfBoundsException in grid span lookup" into tm-qpr-dev am: b2acb96510

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20785398

Change-Id: I1ca2da4a399f364d2ee1d7186d7ffc5338914d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -203,8 +203,12 @@ public class AllAppsGridAdapter<T extends Context & ActivityContext> extends
 
         @Override
         public int getSpanSize(int position) {
-            int viewType = mApps.getAdapterItems().get(position).viewType;
             int totalSpans = mGridLayoutMgr.getSpanCount();
+            List<AdapterItem> items = mApps.getAdapterItems();
+            if (position >= items.size()) {
+                return totalSpans;
+            }
+            int viewType = items.get(position).viewType;
             if (isIconViewType(viewType)) {
                 return totalSpans / mAppsPerRow;
             } else {