commit 565e33c6080fc6867ccb53ab740d1f17e6b77280
author Ihab Awad <ihab@google.com> Mon Dec 01 16:24:33 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 01 16:24:34 2014 +0000
tree 3ccb79e9fb15fceadf18227f4961fbf78daea1e0
parent ce5effba809645c61574ebf186619b6f2e422d94
parent e80b9c19c70c3d18732d77fa6d56283dfecbe58d

Merge "Telecom API updates (2/6)" into lmp-mr1-dev

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;