summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-09-13 14:47:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-13 14:47:52 +0000
commit62ba4376d522aac95827c3df173ed00e47a3fffd (patch)
treecdfce52e87d5d872b4e7df9b8c447f1ce5fc1a97 /src
parent584b7852c539602d6104920b5d0471a3b86e25cc (diff)
parent6635f2e29fd0bce36b0059190b8c648036fb724a (diff)
Merge "Fix crash when dropping outside of list" into klp-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/dialer/list/PhoneFavoritesTileAdapter.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
index 966233862..a4d62d864 100644
--- a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
+++ b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
@@ -586,7 +586,7 @@ public class PhoneFavoritesTileAdapter extends BaseAdapter implements
public void dropContactEntry(int index) {
boolean changed = false;
if (mDraggedEntry != null) {
- if (index >= 0 && index <= mContactEntries.size()) {
+ if (index >= 0 && index < mContactEntries.size()) {
// Don't add the ContactEntry here (to prevent a double animation from occuring).
// When we receive a new cursor the list of contact entries will automatically be
// populated with the dragged ContactEntry at the correct spot.
@@ -1110,7 +1110,6 @@ public class PhoneFavoritesTileAdapter extends BaseAdapter implements
ContactEntry entryToPin, int oldPos, int newPinPos) {
final ContentValues cv = new ContentValues();
-
// Add the dragged contact at the user-requested spot.
cv.put(String.valueOf(entryToPin.id), newPinPos);