commit b09360cc20dfaf579668ebff82839ac0da1de880
author Jay Shrauner <shrauner@google.com> Fri Dec 20 19:32:32 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 20 19:32:32 2013 +0000
tree 48f49d494d4a39d36138290fc25e61a63325dde5
parent 66ed26d14dab7693427df39628f3a5f5c300005f
parent d0aa0f6fa23a345cbd117d3aa89e1dc95f857050

Merge "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 9e38394..81d9bfd 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) {