From ea36747114cb8c06742994dddc6a3cff2b666e69 Mon Sep 17 00:00:00 2001
From: Dmitri Plotnikov <dplotnikov@google.com>
Date: Fri, 18 Sep 2009 15:04:58 -0700
Subject: [PATCH] Revert "ContactsContract: Adding joined columns to the Data
 class definition."

This reverts commit dd768a6a736bc202b62aa20f3282b3cfb285dc7f.
---
 core/java/android/provider/ContactsContract.java   | 3 +--
 core/java/android/widget/FasttrackBadgeWidget.java | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index a84fba0393b74..93ee3ba942681 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -682,8 +682,7 @@ public final class ContactsContract {
      * definition and some generic columns. Each data type can define the meaning for each of
      * the generic columns.
      */
-    public static final class Data implements BaseColumns, DataColumns, RawContactsColumns,
-            ContactsColumns, SyncColumns {
+    public static final class Data implements BaseColumns, DataColumns {
         /**
          * This utility class cannot be instantiated
          */
diff --git a/core/java/android/widget/FasttrackBadgeWidget.java b/core/java/android/widget/FasttrackBadgeWidget.java
index 331659c11a8fd..9d2307fa5ff3d 100644
--- a/core/java/android/widget/FasttrackBadgeWidget.java
+++ b/core/java/android/widget/FasttrackBadgeWidget.java
@@ -25,9 +25,9 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.FastTrack;
-import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.Intents;
 import android.provider.ContactsContract.PhoneLookup;
+import android.provider.ContactsContract.RawContacts;
 import android.provider.ContactsContract.CommonDataKinds.Email;
 import android.util.AttributeSet;
 import android.view.View;
@@ -55,7 +55,7 @@ public class FasttrackBadgeWidget extends ImageView implements OnClickListener {
     static final private int TOKEN_PHONE_LOOKUP_AND_TRIGGER = 3;
 
     static final String[] EMAIL_LOOKUP_PROJECTION = new String[] {
-        Data.CONTACT_ID,
+        RawContacts.CONTACT_ID,
         Contacts.LOOKUP_KEY,
     };
     static int EMAIL_ID_COLUMN_INDEX = 0;