commit 8340c92d31e52222cd9a5bdb806b5b3f72064581
author Jay Shrauner <shrauner@google.com> Mon Mar 03 22:25:16 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 03 22:25:16 2014 +0000
tree 01d47643d33bcaac472b21b9cfc961bfae0e39d5
parent 19a1d14b586a4c0401fa5542042820fe8dd3af0a
parent bb650e8f962934f81d176bf7f83aeedaf1108a00

am bb650e8f: am 906befb1: Merge "Fix potential NPE in saveHorizontalOffsets" into klp-dev

* commit 'bb650e8f962934f81d176bf7f83aeedaf1108a00':
  Fix potential NPE in saveHorizontalOffsets

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

diff --git a/src/com/android/dialer/list/PhoneFavoriteFragment.java b/src/com/android/dialer/list/PhoneFavoriteFragment.java
index 34666ee..04611b4 100644
--- a/src/com/android/dialer/list/PhoneFavoriteFragment.java
+++ b/src/com/android/dialer/list/PhoneFavoriteFragment.java
@@ -453,8 +453,11 @@
     }
 
     private void saveHorizontalOffsets(ContactTileRow row, ArrayList<ContactEntry> list) {
-        for (int i = 0; i < list.size(); i++) {
+        for (int i = 0; i < list.size() && i < row.getChildCount(); i++) {
             final View child = row.getChildAt(i);
+            if (child == null) {
+                continue;
+            }
             final ContactEntry entry = list.get(i);
             final long itemId = mContactTileAdapter.getAdjustedItemId(entry.id);
             if (DEBUG) {