Contacts: Fix IllegalArgumentException when link contacts
When choose contact to link, we will see "Contacts keep stopping".
The root cause is that query SQL loss the "selection".
Add the query SQL "selection" and remove useless code meanwhile.
Change-Id: I09f475672cb989804d5ebb3f2a5352a974598cea
CRs-Fixed: 2449645
diff --git a/src/com/android/contacts/lettertiles/LetterTileDrawable.java b/src/com/android/contacts/lettertiles/LetterTileDrawable.java
old mode 100644
new mode 100755
index 55df967..b80fd4f
--- a/src/com/android/contacts/lettertiles/LetterTileDrawable.java
+++ b/src/com/android/contacts/lettertiles/LetterTileDrawable.java
@@ -16,8 +16,6 @@
package com.android.contacts.lettertiles;
-import android.accounts.Account;
-import android.content.Context;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.Bitmap;
diff --git a/src/com/android/contacts/list/JoinContactListAdapter.java b/src/com/android/contacts/list/JoinContactListAdapter.java
old mode 100644
new mode 100755
index 1903a73..82da6f7
--- a/src/com/android/contacts/list/JoinContactListAdapter.java
+++ b/src/com/android/contacts/list/JoinContactListAdapter.java
@@ -97,6 +97,7 @@
.build();
}
loader.setUri(allContactsUri);
+ loader.setSelection(Contacts._ID + "!=?");
loader.setSelectionArgs(new String[]{ String.valueOf(mTargetContactId) });
if (getSortOrder() == ContactsPreferences.SORT_ORDER_PRIMARY) {
loader.setSortOrder(Contacts.SORT_KEY_PRIMARY);
diff --git a/src/com/android/contacts/model/RawContactDelta.java b/src/com/android/contacts/model/RawContactDelta.java
old mode 100644
new mode 100755
index 0666517..6ee31ba
--- a/src/com/android/contacts/model/RawContactDelta.java
+++ b/src/com/android/contacts/model/RawContactDelta.java
@@ -27,12 +27,12 @@
import android.provider.ContactsContract.Data;
import android.provider.ContactsContract.Profile;
import android.provider.ContactsContract.RawContacts;
-import android.text.TextUtils;
import android.util.Log;
import com.android.contacts.compat.CompatUtils;
import com.android.contacts.model.account.AccountType;
import com.android.contacts.model.account.AccountWithDataSet;
+
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;