From c57f6640569acb1df4fc5d7d2b026e824351b531 Mon Sep 17 00:00:00 2001
From: Jay Shrauner <shrauner@google.com>
Date: Tue, 25 Nov 2014 14:42:43 -0800
Subject: Fix NPE in markDropArea

Check for mDraggedEntry == null

Bug:18524967
Change-Id: I323cf41ddd21444d4fd675543b822c29517e8b26
---
 src/com/android/dialer/list/PhoneFavoritesTileAdapter.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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;
-- 
cgit v1.2.3