Add Email.ENTERPRISE_CONTENT_LOOKUP_URI

Like PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI
Apps in primary profile can have email lookup in managed profile

Bug: 19550046

Change-Id: I492909126faf4e1a2eb5c72f7f76f3a7a0656e6a

1 files changed, 8 insertions, 5 deletions

diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
index 501f04e..6a175ed 100644
--- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
@@ -1920,7 +1920,7 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
         assertEquals(0, getCount(Calls.CONTENT_URI));
     }
 
-    public void testRewriteCorpPhoneLookup() {
+    public void testRewriteCorpLookup() {
         // 19 columns
         final MatrixCursor c = new MatrixCursor(new String[] {
                 PhoneLookup._ID,
@@ -1945,7 +1945,8 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
         });
 
         // First, convert and make sure it returns an empty cursor.
-        Cursor rewritten = ContactsProvider2.rewriteCorpPhoneLookup(c.getColumnNames(), c);
+        Cursor rewritten = ContactsProvider2.rewriteCorpLookup(c.getColumnNames(), c,
+                PhoneLookup._ID);
         assertEquals(0, rewritten.getCount());
         assertEquals(19, rewritten.getColumnCount());
 
@@ -1992,7 +1993,8 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
                 "label", // PhoneLookup.LABEL,
                 "+1234", // PhoneLookup.NORMALIZED_NUMBER
         });
-        rewritten = ContactsProvider2.rewriteCorpPhoneLookup(c.getColumnNames(), c);
+        rewritten = ContactsProvider2.rewriteCorpLookup(c.getColumnNames(), c,
+                PhoneLookup._ID);
         assertEquals(2, rewritten.getCount());
         assertEquals(19, rewritten.getColumnCount());
 
@@ -2044,8 +2046,9 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
         assertEquals("+1234", rewritten.getString(column++));
 
         // Use a narower projection.
-        rewritten = ContactsProvider2.rewriteCorpPhoneLookup(
-                new String[] {PhoneLookup.PHOTO_URI, PhoneLookup.PHOTO_THUMBNAIL_URI}, c);
+        rewritten = ContactsProvider2.rewriteCorpLookup(
+                new String[] {PhoneLookup.PHOTO_URI, PhoneLookup.PHOTO_THUMBNAIL_URI}, c,
+                        PhoneLookup._ID);
         assertEquals(2, rewritten.getCount());
         assertEquals(2, rewritten.getColumnCount());