Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5c5ed7b authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

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

Change-Id: If1a8ab01941e2017ed7532a61607c4ce09793e14
parent 2a8cef0e

src/com/android/contacts/ContactsListActivity.java

+3 −2
Original line number Diff line number Diff line
@@ -1719,7 +1719,7 @@ public final class ContactsListActivity extends ListActivity implements 
            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 @@ public final class ContactsListActivity extends ListActivity implements 
                        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);