Permalink
Browse files

Revert "Add Facebook contact support (1/2)"

This reverts commit 783c5b2.
  • Loading branch information...
1 parent 783c5b2 commit 69bcfe39ae7e43ae1b31c8dcdd9935f7436e7046 @jdkoreclipse jdkoreclipse committed May 9, 2012
Showing with 2 additions and 12 deletions.
  1. +0 −6 res/values/arrays.xml
  2. +2 −6 src/com/android/providers/contacts/ContactsDatabaseHelper.java
View
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string-array name="unrestricted_packages">
- <item>com.facebook.katana</item>
- </string-array>
-</resources>
@@ -379,8 +379,6 @@
Tables.RAW_CONTACTS + "." + RawContacts.CONTACT_ID;
public static final String CONCRETE_NAME_VERIFIED =
Tables.RAW_CONTACTS + "." + RawContacts.NAME_VERIFIED;
- public static final String CONCRETE_IS_RESTRICTED =
- Tables.RAW_CONTACTS + "." + RawContacts.IS_RESTRICTED;
}
public interface DataColumns {
@@ -924,8 +922,7 @@ public void onCreate(SQLiteDatabase db) {
RawContacts.SYNC1 + " TEXT, " +
RawContacts.SYNC2 + " TEXT, " +
RawContacts.SYNC3 + " TEXT, " +
- RawContacts.SYNC4 + " TEXT, " +
- RawContacts.IS_RESTRICTED + " INTEGER " +
+ RawContacts.SYNC4 + " TEXT " +
");");
db.execSQL("CREATE INDEX raw_contacts_contact_id_index ON " + Tables.RAW_CONTACTS + " (" +
@@ -1556,8 +1553,7 @@ private void createContactsViews(SQLiteDatabase db) {
+ RawContactsColumns.CONCRETE_SYNC1 + " AS " + RawContacts.SYNC1 + ","
+ RawContactsColumns.CONCRETE_SYNC2 + " AS " + RawContacts.SYNC2 + ","
+ RawContactsColumns.CONCRETE_SYNC3 + " AS " + RawContacts.SYNC3 + ","
- + RawContactsColumns.CONCRETE_SYNC4 + " AS " + RawContacts.SYNC4 + ","
- + RawContactsColumns.CONCRETE_IS_RESTRICTED + " AS " + RawContacts.IS_RESTRICTED;
+ + RawContactsColumns.CONCRETE_SYNC4 + " AS " + RawContacts.SYNC4;
String baseContactColumns =
Contacts.HAS_PHONE_NUMBER + ", "

0 comments on commit 69bcfe3

Please sign in to comment.