commit 4ad916ec4a34d18ab6ad35f1fbfb7a73de30ba24
author Jay Shrauner <shrauner@google.com> Mon Dec 01 06:14:38 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 01 06:14:38 2014 +0000
tree 1e26e0e5b78f2157d4ae2bd0e0fcabe964c31c64
parent 3412bb1e0d2d513023a3301234e5055a4835c178
parent ce5effba809645c61574ebf186619b6f2e422d94

am ce5effba: Merge "Fix NPE in markDropArea" into lmp-mr1-dev

* commit 'ce5effba809645c61574ebf186619b6f2e422d94':
  Fix NPE in markDropArea

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

diff --git a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
index 382e42e..3f67012 100644
--- a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
+++ b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
@@ -441,7 +441,8 @@
      * @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;