Merge "Make Work Directory API as Enterprise API"
diff --git a/api/current.txt b/api/current.txt
index c6472ec..aba695e 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -30091,10 +30091,10 @@
field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_directory";
field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/contact_directories";
field public static final android.net.Uri CONTENT_URI;
- field public static final android.net.Uri CORP_CONTENT_URI;
field public static final long DEFAULT = 0L; // 0x0L
field public static final java.lang.String DIRECTORY_AUTHORITY = "authority";
field public static final java.lang.String DISPLAY_NAME = "displayName";
+ field public static final android.net.Uri ENTERPRISE_CONTENT_URI;
field public static final java.lang.String EXPORT_SUPPORT = "exportSupport";
field public static final int EXPORT_SUPPORT_ANY_ACCOUNT = 2; // 0x2
field public static final int EXPORT_SUPPORT_NONE = 0; // 0x0
diff --git a/api/system-current.txt b/api/system-current.txt
index 1c62c34..524cda8 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -32076,10 +32076,10 @@
field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_directory";
field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/contact_directories";
field public static final android.net.Uri CONTENT_URI;
- field public static final android.net.Uri CORP_CONTENT_URI;
field public static final long DEFAULT = 0L; // 0x0L
field public static final java.lang.String DIRECTORY_AUTHORITY = "authority";
field public static final java.lang.String DISPLAY_NAME = "displayName";
+ field public static final android.net.Uri ENTERPRISE_CONTENT_URI;
field public static final java.lang.String EXPORT_SUPPORT = "exportSupport";
field public static final int EXPORT_SUPPORT_ANY_ACCOUNT = 2; // 0x2
field public static final int EXPORT_SUPPORT_NONE = 0; // 0x0
diff --git a/api/test-current.txt b/api/test-current.txt
index 4aeb8ee..8ab19c4 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -30093,10 +30093,10 @@
field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_directory";
field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/contact_directories";
field public static final android.net.Uri CONTENT_URI;
- field public static final android.net.Uri CORP_CONTENT_URI;
field public static final long DEFAULT = 0L; // 0x0L
field public static final java.lang.String DIRECTORY_AUTHORITY = "authority";
field public static final java.lang.String DISPLAY_NAME = "displayName";
+ field public static final android.net.Uri ENTERPRISE_CONTENT_URI;
field public static final java.lang.String EXPORT_SUPPORT = "exportSupport";
field public static final int EXPORT_SUPPORT_ANY_ACCOUNT = 2; // 0x2
field public static final int EXPORT_SUPPORT_NONE = 0; // 0x0
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 6c83964..89c0c85 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -394,12 +394,19 @@
Uri.withAppendedPath(AUTHORITY_URI, "directories");
/**
- * The content:// style URI for enterprise Directory table. Requests to this URI can be
- * performed on the UI thread because they are always unblocking.
+ * URI used for getting all directories from primary and managed profile.
+ * It supports the same semantics as {@link #CONTENT_URI} and returns the same columns.
+ * If the device has no managed profile that is linked to the current profile, it behaves
+ * in the exact same way as {@link #CONTENT_URI}.
+ * If there is a managed profile linked to the current profile, it will merge
+ * managed profile and current profile's results and return.
+ *
+ * Note: this query returns primary profile results before managed profile results,
+ * and this order is not affected by sorting parameter.
*
*/
- public static final Uri CORP_CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI,
- "directories_corp");
+ public static final Uri ENTERPRISE_CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI,
+ "directories_enterprise");
/**
* The MIME-type of {@link #CONTENT_URI} providing a directory of