Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f1ec84c authored by Anthony Lee's avatar Anthony Lee Committed by Divya Sharma
Browse files

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
parent 364edc65

src/com/android/dialer/list/PhoneFavoritesTileAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ public class PhoneFavoritesTileAdapter extends BaseAdapter implements 
     * @param itemIndex Position of the contact in {@link #mContactEntries}.

     * @return True if the given index is valid for {@link #mContactEntries}.

     */

    private boolean isIndexInBound(int itemIndex) {

    public boolean isIndexInBound(int itemIndex) {

        return itemIndex >= 0 && itemIndex < mContactEntries.size();

    }

src/com/android/dialer/list/SpeedDialFragment.java

+13 −1
Original line number Diff line number Diff line
@@ -315,6 +315,12 @@ public class SpeedDialFragment extends AnalyticsFragment implements OnItemClickL 
        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: "
@@ -323,7 +329,6 @@ public class SpeedDialFragment extends AnalyticsFragment implements OnItemClickL 
            mItemIdTopMap.put(itemId, child.getTop());

            mItemIdLeftMap.put(itemId, child.getLeft());

        }



        mItemIdTopMap.put(KEY_REMOVED_ITEM_HEIGHT, removedItemHeight);

    }
@@ -351,6 +356,13 @@ public class SpeedDialFragment extends AnalyticsFragment implements OnItemClickL 
                    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)) {