diff options
| author | Jay Shrauner <shrauner@google.com> | 2013-12-06 13:57:41 -0800 |
|---|---|---|
| committer | Jay Shrauner <shrauner@google.com> | 2013-12-19 10:06:43 -0800 |
| commit | d0aa0f6fa23a345cbd117d3aa89e1dc95f857050 (patch) | |
| tree | 5a94e11a6075377b534f6ccf3b0dddc434fb5ef9 /src | |
| parent | 7983206661f065342767bb4141d7a924323b2933 (diff) | |
Fix potential NPE in saveHorizontalOffsets
Fix potential NPE in saveHorizontalOffsets.
Bug:12031506
Change-Id: I713fed5995356bdaaf93186454dcc53b92cb75ec
Diffstat (limited to 'src')
| -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 34666ee99..04611b4ec 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) { |