Merge change 25829 into eclair
* changes:
Revert "ContactsContract: Adding joined columns to the Data class definition."
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index a84fba0..93ee3ba 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -682,8 +682,7 @@
* 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 331659c..9d2307f 100644
--- a/core/java/android/widget/FasttrackBadgeWidget.java
+++ b/core/java/android/widget/FasttrackBadgeWidget.java
@@ -25,9 +25,9 @@
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 @@
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;