summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRicky Wai <rickywai@google.com>2015-02-26 16:51:32 +0000
committerRicky Wai <rickywai@google.com>2015-03-04 19:19:31 +0000
commitfa5bbaf6f625ed73797d4dbd9d09baacf622f380 (patch)
tree9191aa9d13a22d7ac30da1903fbbb7a356763642 /core
parent40d13f260c50ac5235f7405e1c3a83d6f46a8d62 (diff)
downloadframeworks_base-fa5bbaf6f625ed73797d4dbd9d09baacf622f380.zip
frameworks_base-fa5bbaf6f625ed73797d4dbd9d09baacf622f380.tar.gz
frameworks_base-fa5bbaf6f625ed73797d4dbd9d09baacf622f380.tar.bz2
Add Phone.ENTERPRISE_CONTENT_URI
Bug: 19550047 Change-Id: I0c780c27913d2c005be4f1ac033cba9a479a0b4f
Diffstat (limited to 'core')
-rw-r--r--core/java/android/provider/ContactsContract.java23
1 files changed, 23 insertions, 0 deletions
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 67ac043..bab91cc 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -4597,6 +4597,15 @@ public final class ContactsContract {
public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, "data");
/**
+ * The content:// style URI for this table in managed profile, which requests a directory
+ * of data rows matching the selection criteria.
+ *
+ * @hide
+ */
+ static final Uri ENTERPRISE_CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI,
+ "data_enterprise");
+
+ /**
* A boolean parameter for {@link Data#CONTENT_URI}.
* This specifies whether or not the returned data items should be filtered to show
* data items belonging to visible contacts only.
@@ -5748,6 +5757,20 @@ public final class ContactsContract {
"phones");
/**
+ * URI used for getting all contacts from primary and managed profile.
+ *
+ * It supports the same semantics as {@link #CONTENT_URI} and returns the same
+ * columns. If the device has no corp profile that is linked to the current profile, it
+ * behaves in the exact same way as {@link #CONTENT_URI}. If there is a corp profile
+ * linked to the current profile, it will merge corp profile and current profile's
+ * results and return
+ *
+ * @hide
+ */
+ public static final Uri ENTERPRISE_CONTENT_URI =
+ Uri.withAppendedPath(Data.ENTERPRISE_CONTENT_URI, "phones");
+
+ /**
* The content:// style URL for phone lookup using a filter. The filter returns
* records of MIME type {@link #CONTENT_ITEM_TYPE}. The filter is applied
* to display names as well as phone numbers. The filter argument should be passed