commit d5c5ed7b8586632c5a1f739014f0b6a80504d2b2
author Dmitri Plotnikov <dplotnikov@google.com> Wed Sep 23 19:21:11 2009 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Wed Sep 23 19:25:45 2009 -0700
tree 4db77ba65d332c82284de8a6da677e682dbe743e
parent 2a8cef0eefdee8b8e6345851e304b609ae21dd2e

[Issue 2139542] Making sure a contact cannot be joined with itself.

Change-Id: If1a8ab01941e2017ed7532a61607c4ce09793e14

src/com/android/contacts/ContactsListActivity.java

diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index 79af879..fef9bb5 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -1719,7 +1719,7 @@
             case MODE_JOIN_CONTACT:
                 mQueryHandler.setLoadingJoinSuggestions(true);
                 mQueryHandler.startQuery(QUERY_TOKEN, null, getJoinSuggestionsUri(null), projection,
-                        null, null, null);
+                        Contacts._ID + " != " + mQueryAggregateId, null, null);
                 break;
         }
     }
@@ -1795,7 +1795,8 @@
                         null, null);
                 mAdapter.setSuggestionsCursor(cursor);
                 return resolver.query(getContactFilterUri(filter), projection,
-                        getContactSelection(), null, getSortOrder(projection));
+                        Contacts._ID + " != " + mQueryAggregateId, null,
+                        getSortOrder(projection));
             }
         }
         throw new UnsupportedOperationException("filtering not allowed in mode " + mMode);