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

Commit 4b97eecf authored by Tony Mak's avatar Tony Mak Committed by Android (Google) Code Review
Browse files

Merge "Add Email.ENTEPRISE_CONTENT_FILTER_URI"

parents 811e6360 415369ea

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -29696,6 +29696,7 @@ package android.provider { 
    field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/email_v2";

    field public static final android.net.Uri CONTENT_URI;

    field public static final java.lang.String DISPLAY_NAME = "data4";

    field public static final android.net.Uri ENTERPRISE_CONTENT_FILTER_URI;

    field public static final android.net.Uri ENTERPRISE_CONTENT_LOOKUP_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";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -31687,6 +31687,7 @@ package android.provider { 
    field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/email_v2";

    field public static final android.net.Uri CONTENT_URI;

    field public static final java.lang.String DISPLAY_NAME = "data4";

    field public static final android.net.Uri ENTERPRISE_CONTENT_FILTER_URI;

    field public static final android.net.Uri ENTERPRISE_CONTENT_LOOKUP_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";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -29698,6 +29698,7 @@ package android.provider { 
    field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/email_v2";

    field public static final android.net.Uri CONTENT_URI;

    field public static final java.lang.String DISPLAY_NAME = "data4";

    field public static final android.net.Uri ENTERPRISE_CONTENT_FILTER_URI;

    field public static final android.net.Uri ENTERPRISE_CONTENT_LOOKUP_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";

core/java/android/provider/ContactsContract.java

+8 −0
Original line number Diff line number Diff line
@@ -6193,6 +6193,14 @@ public final class ContactsContract { 
            public static final Uri CONTENT_FILTER_URI = Uri.withAppendedPath(CONTENT_URI,

                    "filter");



            /**

             * 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 ENTERPRISE_CONTENT_FILTER_URI = Uri.withAppendedPath(

                    CONTENT_URI, "filter_enterprise");



            /**

             * The email address.

             * <P>Type: TEXT</P>