diff options
author | Jay Shrauner <shrauner@google.com> | 2014-12-01 06:08:08 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-01 06:08:08 +0000 |
commit | ce5effba809645c61574ebf186619b6f2e422d94 (patch) | |
tree | 1e26e0e5b78f2157d4ae2bd0e0fcabe964c31c64 | |
parent | 910fcbff0051d389a449c0ec57b825458e8f9015 (diff) | |
parent | c57f6640569acb1df4fc5d7d2b026e824351b531 (diff) |
Merge "Fix NPE in markDropArea" into lmp-mr1-dev
-rw-r--r-- | src/com/android/dialer/list/PhoneFavoritesTileAdapter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java index 382e42e56..3f670127f 100644 --- a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java +++ b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java @@ -441,7 +441,8 @@ public class PhoneFavoritesTileAdapter extends BaseAdapter implements * @param itemIndex Position of the contact in {@link #mContactEntries}. */ private void markDropArea(int itemIndex) { - if (isIndexInBound(mDragEnteredEntryIndex) && isIndexInBound(itemIndex)) { + if (mDraggedEntry != null && isIndexInBound(mDragEnteredEntryIndex) && + isIndexInBound(itemIndex)) { mDataSetChangedListener.cacheOffsetsForDatasetChange(); // Remove the old placeholder item and place the new placeholder item. final int oldIndex = mDragEnteredEntryIndex; |