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

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

Merge "Add ContactsContract.Contacts.CORP_CONTENT_FILTER_URI"

parents 6c880855 a5efc477

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -25796,6 +25796,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 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";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -27779,6 +27779,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 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";

core/java/android/provider/ContactsContract.java

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

                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.

         */

        public static final Uri CORP_CONTENT_FILTER_URI = Uri.withAppendedPath(

                CORP_CONTENT_URI, "filter");



        /**

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

         * {@link ContactsContract.Data}, filtered to include only starred contacts