Fix derp in labeling that breaks messaging

Change-Id: I6da0cbcc469303ea74e7adb61c59d702abb20f8d

1 files changed, 6 insertions, 16 deletions

diff --git a/src/com/android/contacts/common/list/PhoneNumberListAdapter.java b/src/com/android/contacts/common/list/PhoneNumberListAdapter.java
index a906735d..cd908540 100644
--- a/src/com/android/contacts/common/list/PhoneNumberListAdapter.java
+++ b/src/com/android/contacts/common/list/PhoneNumberListAdapter.java
@@ -50,9 +50,6 @@ import com.android.contacts.common.util.Constants;
 import com.android.contacts.common.MoreContactUtils;
 import com.android.contacts.common.model.account.SimAccountType;
 
-import com.android.phone.common.incall.CallMethodInfo;
-import com.android.phone.common.incall.CallMethodHelper;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -78,8 +75,6 @@ public class PhoneNumberListAdapter extends ContactEntryListAdapter {
     // exist, this will be Long.MAX_VALUE
     private long mFirstExtendedDirectoryId = Long.MAX_VALUE;
 
-    private CallMethodInfo mCurrentCallMethodInfo;
-
     public static class PhoneQuery {
 
         /**
@@ -459,19 +454,18 @@ public class PhoneNumberListAdapter extends ContactEntryListAdapter {
         bindPhoneNumber(view, cursor, directory.isDisplayNumber());
     }
 
+
+    public String getLabelType(Cursor c, int type) {
+        return null;
+    }
+
     protected void bindPhoneNumber(ContactListItemView view, Cursor cursor, boolean displayNumber) {
         CharSequence label = null;
         if (displayNumber &&  !cursor.isNull(PhoneQuery.PHONE_TYPE)) {
             final int type = cursor.getInt(PhoneQuery.PHONE_TYPE);
             final String customLabel = cursor.getString(PhoneQuery.PHONE_LABEL);
 
-            if (type == Phone.TYPE_CUSTOM) {
-                final String providerLabel = cursor.getString(PhoneQuery.PHONE_MIME_TYPE);
-                CallMethodInfo cmi = CallMethodHelper.getMethodForMimeType(providerLabel);
-                if (cmi != null) {
-                    label = cmi.mName;
-                }
-            }
+            label = getLabelType(cursor, type);
 
             // TODO cache
             if (label == null) {
@@ -652,8 +646,4 @@ public class PhoneNumberListAdapter extends ContactEntryListAdapter {
         return disabledSimName;
     }
 
-    public void setCurrentCallMethod(CallMethodInfo cmi) {
-        mCurrentCallMethodInfo = cmi;
-    }
-
 }