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

Commit 82e0c6f3 authored by Daniel Lehmann's avatar Daniel Lehmann Committed by Android (Google) Code Review
Browse files

Merge "Add the lookup_key column, which should have been in the previous CL"

parents 03605fa8 ceb476a5

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -16714,6 +16714,7 @@ package android.provider { 
    field public static final java.lang.String ACCOUNT_TYPE = "account_type";

    field public static final java.lang.String COMMENTS = "comments";

    field public static final java.lang.String CONTACT_ID = "contact_id";

    field public static final java.lang.String CONTACT_LOOKUP_KEY = "contact_lookup";

    field public static final java.lang.String DATA_SET = "data_set";

    field public static final java.lang.String RAW_CONTACT_ID = "raw_contact_id";

    field public static final java.lang.String RAW_CONTACT_SOURCE_ID = "raw_contact_source_id";

core/java/android/provider/ContactsContract.java

+15 −2
Original line number Diff line number Diff line
@@ -3083,12 +3083,25 @@ public final class ContactsContract { 
        /**

         * A reference to the {@link android.provider.ContactsContract.Contacts#_ID}

         * that this stream item belongs to.

         *

         * <p>Type: INTEGER</p>

         * <p>read-only</p>

         */

        public static final String CONTACT_ID = "contact_id";



        /**

         * A reference to the {@link android.provider.ContactsContract.Contacts#LOOKUP_KEY}

         * that this stream item belongs to.

         *

         * <p>Type: TEXT</p>

         * <p>read-only</p>

         */

        public static final String CONTACT_LOOKUP_KEY = "contact_lookup";



        /**

         * A reference to the {@link RawContacts#_ID}

         * that this stream item belongs to.

         * <p>Type: INTEGER</p>

         */

        public static final String RAW_CONTACT_ID = "raw_contact_id";
@@ -3104,7 +3117,7 @@ public final class ContactsContract { 
         * The account type to which the raw_contact of this item is associated. See

         * {@link RawContacts#ACCOUNT_TYPE}

         *

         * <p>TYPE: text</p>

         * <p>Type: TEXT</p>

         * <p>read-only</p>

         */

        public static final String ACCOUNT_TYPE = "account_type";
@@ -3113,7 +3126,7 @@ public final class ContactsContract { 
         * The account name to which the raw_contact of this item is associated. See

         * {@link RawContacts#ACCOUNT_NAME}

         *

         * <p>TYPE: text</p>

         * <p>Type: TEXT</p>

         * <p>read-only</p>

         */

        public static final String ACCOUNT_NAME = "account_name";