Merge "Fix contacts vcard cannot be shared in other profiles" into nyc-dev

1 files changed, 15 insertions, 0 deletions

diff --git a/src/com/android/providers/contacts/enterprise/EnterprisePolicyGuard.java b/src/com/android/providers/contacts/enterprise/EnterprisePolicyGuard.java
index bc8388fa..d60a9000 100644
--- a/src/com/android/providers/contacts/enterprise/EnterprisePolicyGuard.java
+++ b/src/com/android/providers/contacts/enterprise/EnterprisePolicyGuard.java
@@ -60,6 +60,10 @@ public class EnterprisePolicyGuard {
             return false;
         }
 
+        if (isUriWhitelisted(uriCode)) {
+            return true;
+        }
+
         final boolean isCallerIdEnabled = !mDpm.getCrossProfileCallerIdDisabled(currentHandle);
         final boolean isContactsSearchEnabled =
                 !mDpm.getCrossProfileContactsSearchDisabled(currentHandle);
@@ -86,6 +90,17 @@ public class EnterprisePolicyGuard {
                 || (isBluetoothContactSharing(uriCode) && isBluetoothContactSharingEnabled);
     }
 
+    private boolean isUriWhitelisted(int uriCode) {
+        switch (uriCode) {
+            case ContactsProvider2.PROFILE_AS_VCARD:
+            case ContactsProvider2.CONTACTS_AS_VCARD:
+            case ContactsProvider2.CONTACTS_AS_MULTI_VCARD:
+                return true;
+            default:
+                return false;
+        }
+    }
+
     /**
      * Check if uri is a cross profile query with directory param supported.
      *