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

This reverts commit 69bcfe3.
ViciousAOSP · May 9, 2012 · 4ab6ec5 · 4ab6ec5
1 parent 69bcfe3
commit 4ab6ec5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="unrestricted_packages">
+        <item>com.facebook.katana</item>
+    </string-array>
+</resources>
diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
@@ -379,6 +379,8 @@ public interface RawContactsColumns {
                 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 {
@@ -922,7 +924,8 @@ public void onCreate(SQLiteDatabase db) {
                 RawContacts.SYNC1 + " TEXT, " +
                 RawContacts.SYNC2 + " TEXT, " +
                 RawContacts.SYNC3 + " TEXT, " +
-                RawContacts.SYNC4 + " TEXT " +
+                RawContacts.SYNC4 + " TEXT, " +
+                RawContacts.IS_RESTRICTED + " INTEGER " +
         ");");
 
         db.execSQL("CREATE INDEX raw_contacts_contact_id_index ON " + Tables.RAW_CONTACTS + " (" +
@@ -1553,7 +1556,8 @@ 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_SYNC4 + " AS " + RawContacts.SYNC4 + ","
+                + RawContactsColumns.CONCRETE_IS_RESTRICTED + " AS " + RawContacts.IS_RESTRICTED;
 
         String baseContactColumns =
                 Contacts.HAS_PHONE_NUMBER + ", "