Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28ef5c58 authored by Ricky Wai's avatar Ricky Wai
Browse files

Make Work Directory API as Enterprise API 

Bug: 25761127
Change-Id: I84e68b4f0c4b1557a0d3764ff48bdeb33bc29787
parent 764e7960

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -30074,10 +30074,10 @@ package android.provider { 
    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

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -32057,10 +32057,10 @@ package android.provider { 
    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

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -30074,10 +30074,10 @@ package android.provider { 
    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

core/java/android/provider/ContactsContract.java

+11 −4
Original line number Diff line number Diff line
@@ -394,12 +394,19 @@ public final class ContactsContract { 
                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