commit 86e3dc4fc5934c156c948f7ed9685ce2c62af61a
author Winson <winsonc@google.com> Mon Jun 06 11:35:46 2016 -0700
committer Winson <winsonc@google.com> Mon Jun 06 11:36:58 2016 -0700
tree 0f03fd77b98419882392333f943488268540ea84
parent 65ffa15c90f82ff3e19bd2f40308637e131832b5

Adding null check for uninitialized CollectionItemInfo.

Bug: 28893815
Change-Id: Ib75b71fbb4d37bb818251527defcef891c7e7510

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 0460c91..42a395d 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -123,14 +123,16 @@
             if (viewType == ICON_VIEW_TYPE || viewType == PREDICTION_ICON_VIEW_TYPE) {
                 super.onInitializeAccessibilityNodeInfoForItem(recycler, state, host, info);
                 CollectionItemInfoCompat itemInfo = info.getCollectionItemInfo();
-                final CollectionItemInfoCompat dstItemInfo = CollectionItemInfoCompat.obtain(
-                        itemInfo.getRowIndex() - getEmptyRowForAccessibility(viewType),
-                        itemInfo.getRowSpan(),
-                        itemInfo.getColumnIndex(),
-                        itemInfo.getColumnSpan(),
-                        itemInfo.isHeading(),
-                        itemInfo.isSelected());
-                info.setCollectionItemInfo(dstItemInfo);
+                if (itemInfo != null) {
+                    final CollectionItemInfoCompat dstItemInfo = CollectionItemInfoCompat.obtain(
+                            itemInfo.getRowIndex() - getEmptyRowForAccessibility(viewType),
+                            itemInfo.getRowSpan(),
+                            itemInfo.getColumnIndex(),
+                            itemInfo.getColumnSpan(),
+                            itemInfo.isHeading(),
+                            itemInfo.isSelected());
+                    info.setCollectionItemInfo(dstItemInfo);
+                }
             }
         }