diff options
| author | Jay Shrauner <shrauner@google.com> | 2013-12-20 19:32:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-12-20 19:32:32 +0000 |
| commit | b09360cc20dfaf579668ebff82839ac0da1de880 (patch) | |
| tree | 48f49d494d4a39d36138290fc25e61a63325dde5 | |
| parent | 66ed26d14dab7693427df39628f3a5f5c300005f (diff) | |
| parent | d0aa0f6fa23a345cbd117d3aa89e1dc95f857050 (diff) | |
| download | android_packages_apps_Dialer-b09360cc20dfaf579668ebff82839ac0da1de880.tar.gz android_packages_apps_Dialer-b09360cc20dfaf579668ebff82839ac0da1de880.tar.bz2 android_packages_apps_Dialer-b09360cc20dfaf579668ebff82839ac0da1de880.zip | |
Merge "Fix potential NPE in saveHorizontalOffsets"
| -rw-r--r-- | src/com/android/dialer/list/PhoneFavoriteFragment.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/dialer/list/PhoneFavoriteFragment.java b/src/com/android/dialer/list/PhoneFavoriteFragment.java index 9e383949b..81d9bfdc8 100644 --- a/src/com/android/dialer/list/PhoneFavoriteFragment.java +++ b/src/com/android/dialer/list/PhoneFavoriteFragment.java @@ -453,8 +453,11 @@ public class PhoneFavoriteFragment extends Fragment implements OnItemClickListen } 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) { |