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

Commit ccf15a45 authored by Ricky Wai's avatar Ricky Wai Committed by Android (Google) Code Review
Browse files

Merge "Change Contacts.CORP_CONTENT_FILTER_URI to enterprise API"

parents 36220e3e 6b38e067

api/current.txt

+3 −1
Original line number Diff line number Diff line
@@ -29962,7 +29962,7 @@ package android.provider { 
    field public static final android.net.Uri CONTENT_URI;

    field public static final java.lang.String CONTENT_VCARD_TYPE = "text/x-vcard";

    field public static final android.net.Uri CONTENT_VCARD_URI;

    field public static final android.net.Uri CORP_CONTENT_FILTER_URI;

    field public static final android.net.Uri ENTERPRISE_CONTENT_FILTER_URI;

    field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";

    field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";

    field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
@@ -30095,6 +30095,8 @@ package android.provider { 
    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 long ENTERPRISE_DEFAULT = 1000000000L; // 0x3b9aca00L

    field public static final long ENTERPRISE_LOCAL_INVISIBLE = 1000000001L; // 0x3b9aca01L

    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

+3 −1
Original line number Diff line number Diff line
@@ -31947,7 +31947,7 @@ package android.provider { 
    field public static final android.net.Uri CONTENT_URI;

    field public static final java.lang.String CONTENT_VCARD_TYPE = "text/x-vcard";

    field public static final android.net.Uri CONTENT_VCARD_URI;

    field public static final android.net.Uri CORP_CONTENT_FILTER_URI;

    field public static final android.net.Uri ENTERPRISE_CONTENT_FILTER_URI;

    field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";

    field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";

    field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
@@ -32080,6 +32080,8 @@ package android.provider { 
    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 long ENTERPRISE_DEFAULT = 1000000000L; // 0x3b9aca00L

    field public static final long ENTERPRISE_LOCAL_INVISIBLE = 1000000001L; // 0x3b9aca01L

    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

+3 −1
Original line number Diff line number Diff line
@@ -29964,7 +29964,7 @@ package android.provider { 
    field public static final android.net.Uri CONTENT_URI;

    field public static final java.lang.String CONTENT_VCARD_TYPE = "text/x-vcard";

    field public static final android.net.Uri CONTENT_VCARD_URI;

    field public static final android.net.Uri CORP_CONTENT_FILTER_URI;

    field public static final android.net.Uri ENTERPRISE_CONTENT_FILTER_URI;

    field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";

    field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";

    field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
@@ -30097,6 +30097,8 @@ package android.provider { 
    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 long ENTERPRISE_DEFAULT = 1000000000L; // 0x3b9aca00L

    field public static final long ENTERPRISE_LOCAL_INVISIBLE = 1000000001L; // 0x3b9aca01L

    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

+5 −9
Original line number Diff line number Diff line
@@ -433,16 +433,12 @@ public final class ContactsContract { 


        /**

         * _ID of the work profile default directory, which represents locally stored contacts.

         *

         * @hide

         */

        public static final long ENTERPRISE_DEFAULT = Directory.ENTERPRISE_DIRECTORY_ID_BASE

                + DEFAULT;



        /**

         * _ID of the work profile directory that represents locally stored invisible contacts.

         *

         * @hide

         */

        public static final long ENTERPRISE_LOCAL_INVISIBLE = Directory.ENTERPRISE_DIRECTORY_ID_BASE

                + LOCAL_INVISIBLE;
@@ -1647,12 +1643,12 @@ public final class ContactsContract { 
                CONTENT_URI, "filter");



        /**

         * It supports the same semantics as {@link #CONTENT_FILTER_URI} and returns the same

         * columns. If there is a corp profile linked to the current profile, it will query corp

         * profile, otherwise it will return null.

         * It supports the similar semantics as {@link #CONTENT_FILTER_URI} and returns the same

         * columns. This URI requires {@link ContactsContract#DIRECTORY_PARAM_KEY} in parameters,

         * otherwise it will throw UnsupportedOperationException.

         */

        public static final Uri CORP_CONTENT_FILTER_URI = Uri.withAppendedPath(

                CORP_CONTENT_URI, "filter");

        public static final Uri ENTERPRISE_CONTENT_FILTER_URI = Uri.withAppendedPath(

                CONTENT_URI, "filter_enterprise");



        /**

         * The content:// style URI for this table joined with useful data from