1 files changed, 18 insertions, 21 deletions
diff --git a/java/com/android/dialer/searchfragment/common/Projections.java b/java/com/android/dialer/searchfragment/common/Projections.java
index cebe5c9a9..e0c74ed66 100644
--- a/java/com/android/dialer/searchfragment/common/Projections.java
+++ b/java/com/android/dialer/searchfragment/common/Projections.java
@@ -16,8 +16,6 @@
 
 package com.android.dialer.searchfragment.common;
 
-import android.provider.ContactsContract.CommonDataKinds.Nickname;
-import android.provider.ContactsContract.CommonDataKinds.Organization;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.Data;
 
@@ -34,33 +32,32 @@ public class Projections {
   public static final int LOOKUP_KEY = 7;
   public static final int CARRIER_PRESENCE = 8;
   public static final int CONTACT_ID = 9;
-  public static final int MIME_TYPE = 10;
 
   @SuppressWarnings("unused")
-  public static final int SORT_KEY = 11;
-
-  public static final int SORT_ALTERNATIVE = 12;
+  public static final int SORT_KEY = 10;
 
+  public static final int SORT_ALTERNATIVE = 11;
+  public static final int MIME_TYPE = 12;
   public static final int COMPANY_NAME = 13;
   public static final int NICKNAME = 14;
 
   public static final String[] CP2_PROJECTION =
       new String[] {
-        Data._ID, // 0
+        Phone._ID, // 0
         Phone.TYPE, // 1
         Phone.LABEL, // 2
         Phone.NUMBER, // 3
-        Data.DISPLAY_NAME_PRIMARY, // 4
-        Data.PHOTO_ID, // 5
-        Data.PHOTO_THUMBNAIL_URI, // 6
-        Data.LOOKUP_KEY, // 7
-        Data.CARRIER_PRESENCE, // 8
-        Data.CONTACT_ID, // 9
-        Data.MIMETYPE, // 10
-        Data.SORT_KEY_PRIMARY, // 11
-        Data.SORT_KEY_ALTERNATIVE, // 12
-        Organization.COMPANY, // 13
-        Nickname.NAME // 14
+        Phone.DISPLAY_NAME_PRIMARY, // 4
+        Phone.PHOTO_ID, // 5
+        Phone.PHOTO_THUMBNAIL_URI, // 6
+        Phone.LOOKUP_KEY, // 7
+        Phone.CARRIER_PRESENCE, // 8
+        Phone.CONTACT_ID, // 9
+        Phone.SORT_KEY_PRIMARY, // 10
+        Phone.SORT_KEY_ALTERNATIVE, // 11
+        // Data.MIMETYPE, // 12
+        // Organization.COMPANY, // 13
+        // Nickname.NAME // 14
       };
 
   // Uses alternative display names (i.e. "Bob Dylan" becomes "Dylan, Bob").
@@ -76,11 +73,11 @@ public class Projections {
         Data.LOOKUP_KEY, // 7
         Data.CARRIER_PRESENCE, // 8
         Data.CONTACT_ID, // 9
-        Data.MIMETYPE, // 10
         Data.SORT_KEY_PRIMARY, // 11
         Data.SORT_KEY_ALTERNATIVE, // 12
-        Organization.COMPANY, // 13
-        Nickname.NAME // 14
+        // Data.MIMETYPE, // 12
+        // Organization.COMPANY, // 13
+        // Nickname.NAME // 14
       };
 
   public static final String[] DATA_PROJECTION =