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

Commit bdff0542 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Implementing ContactNameColumns in PhoneLookup too"

parents 0a9ba66b 2c3fb3fc

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -31792,7 +31792,7 @@ package android.provider { 
    field public static final java.lang.String TERTIARY_PHONE_TYPE = "tertiary_phone_type";

  }













  public static final class ContactsContract.PhoneLookup implements android.provider.BaseColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactsColumns android.provider.ContactsContract.PhoneLookupColumns {













  public static final class ContactsContract.PhoneLookup implements android.provider.BaseColumns android.provider.ContactsContract.ContactNameColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactsColumns android.provider.ContactsContract.PhoneLookupColumns {















    field public static final android.net.Uri CONTENT_FILTER_URI;















    field public static final android.net.Uri ENTERPRISE_CONTENT_FILTER_URI;















    field public static final java.lang.String QUERY_PARAMETER_SIP_ADDRESS = "sip";

























api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -34438,7 +34438,7 @@ package android.provider {













    field public static final java.lang.String STATE = "state";















  }



























  public static final class ContactsContract.PhoneLookup implements android.provider.BaseColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactsColumns android.provider.ContactsContract.PhoneLookupColumns {













  public static final class ContactsContract.PhoneLookup implements android.provider.BaseColumns android.provider.ContactsContract.ContactNameColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactsColumns android.provider.ContactsContract.PhoneLookupColumns {















    field public static final android.net.Uri CONTENT_FILTER_URI;















    field public static final android.net.Uri ENTERPRISE_CONTENT_FILTER_URI;















    field public static final java.lang.String QUERY_PARAMETER_SIP_ADDRESS = "sip";

























api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -31869,7 +31869,7 @@ package android.provider {













    field public static final java.lang.String TERTIARY_PHONE_TYPE = "tertiary_phone_type";















  }



























  public static final class ContactsContract.PhoneLookup implements android.provider.BaseColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactsColumns android.provider.ContactsContract.PhoneLookupColumns {













  public static final class ContactsContract.PhoneLookup implements android.provider.BaseColumns android.provider.ContactsContract.ContactNameColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactsColumns android.provider.ContactsContract.PhoneLookupColumns {















    field public static final android.net.Uri CONTENT_FILTER_URI;















    field public static final android.net.Uri ENTERPRISE_CONTENT_FILTER_URI;















    field public static final java.lang.String QUERY_PARAMETER_SIP_ADDRESS = "sip";

























core/java/android/provider/ContactsContract.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -5166,7 +5166,7 @@ public final class ContactsContract {













     * </table>















     */















    public static final class PhoneLookup implements BaseColumns, PhoneLookupColumns,













            ContactsColumns, ContactOptionsColumns {













            ContactsColumns, ContactOptionsColumns, ContactNameColumns {















        /**















         * This utility class cannot be instantiated















         */