Fix crasher due to IndexOutOfBoundsException

Make sure that we check for the index to exist in the list before
we query for it.  The problem is that the index is grabbed from the
listview but then applied to the contact entry arraylist. It is
possible that these two are out of temporarily out of sync. This check
will make sure that we do not throw an exception in those cases.

Bug: 19103509
Change-Id: Iba620ec859866b9f8bfc2614a17b1b1a11037230

1 files changed, 13 insertions, 1 deletions

diff --git a/src/com/android/dialer/list/SpeedDialFragment.java b/src/com/android/dialer/list/SpeedDialFragment.java
index a42031677..63f1f34c6 100644
--- a/src/com/android/dialer/list/SpeedDialFragment.java
+++ b/src/com/android/dialer/list/SpeedDialFragment.java
@@ -312,6 +312,12 @@ public class SpeedDialFragment extends Fragment implements OnItemClickListener,
         for (int i = 0; i < mListView.getChildCount(); i++) {
             final View child = mListView.getChildAt(i);
             final int position = firstVisiblePosition + i;
+            // Since we are getting the position from mListView and then querying
+            // mContactTileAdapter, its very possible that things are out of sync
+            // and we might index out of bounds.  Let's make sure that this doesn't happen.
+            if (!mContactTileAdapter.isIndexInBound(position)) {
+                continue;
+            }
             final long itemId = mContactTileAdapter.getItemId(position);
             if (DEBUG) {
                 Log.d(TAG, "Saving itemId: " + itemId + " for listview child " + i + " Top: "
@@ -320,7 +326,6 @@ public class SpeedDialFragment extends Fragment implements OnItemClickListener,
             mItemIdTopMap.put(itemId, child.getTop());
             mItemIdLeftMap.put(itemId, child.getLeft());
         }
-
         mItemIdTopMap.put(KEY_REMOVED_ITEM_HEIGHT, removedItemHeight);
     }
 
@@ -348,6 +353,13 @@ public class SpeedDialFragment extends Fragment implements OnItemClickListener,
                     final View child = mListView.getChildAt(i);
                     int position = firstVisiblePosition + i;
 
+                    // Since we are getting the position from mListView and then querying
+                    // mContactTileAdapter, its very possible that things are out of sync
+                    // and we might index out of bounds.  Let's make sure that this doesn't happen.
+                    if (!mContactTileAdapter.isIndexInBound(position)) {
+                        continue;
+                    }
+
                     final long itemId = mContactTileAdapter.getItemId(position);
 
                     if (containsId(idsInPlace, itemId)) {