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

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

Merge "[ContactsContract] Add new API PhoneLookup.CONTACT_ID and DATA_ID" into nyc-dev

parents fccb29cb fd9ec5a6

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -31469,6 +31469,8 @@ package android.provider { 
  }















  protected static abstract interface ContactsContract.PhoneLookupColumns {













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













    field public static final java.lang.String DATA_ID = "data_id";















    field public static final java.lang.String LABEL = "label";















    field public static final java.lang.String NORMALIZED_NUMBER = "normalized_number";















    field public static final java.lang.String NUMBER = "number";

























api/system-current.txt



+2
−0




























Original line number
Diff line number
Diff line








@@ -33847,6 +33847,8 @@ package android.provider {













  }





























  protected static abstract interface ContactsContract.PhoneLookupColumns {













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













    field public static final java.lang.String DATA_ID = "data_id";















    field public static final java.lang.String LABEL = "label";















    field public static final java.lang.String NORMALIZED_NUMBER = "normalized_number";















    field public static final java.lang.String NUMBER = "number";

























api/test-current.txt



+2
−0




























Original line number
Diff line number
Diff line








@@ -31482,6 +31482,8 @@ package android.provider {













  }





























  protected static abstract interface ContactsContract.PhoneLookupColumns {













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













    field public static final java.lang.String DATA_ID = "data_id";















    field public static final java.lang.String LABEL = "label";















    field public static final java.lang.String NORMALIZED_NUMBER = "normalized_number";















    field public static final java.lang.String NUMBER = "number";

























core/java/android/provider/ContactsContract.java



+23
−0




























Original line number
Diff line number
Diff line








@@ -4981,6 +4981,17 @@ public final class ContactsContract {













     * @see PhoneLookup















     */















    protected interface PhoneLookupColumns {













        /**













         *  The ID of the data row.













         *  <P>Type: INTEGER</P>













         */













        public static final String DATA_ID = "data_id";













        /**













         * A reference to the {@link ContactsContract.Contacts#_ID} that this













         * data belongs to.













         * <P>Type: INTEGER</P>













         */













        public static final String CONTACT_ID = "contact_id";















        /**















         * The phone number as the user entered it.















         * <P>Type: TEXT</P>










@@ -5055,6 +5066,18 @@ public final class ContactsContract {













     * <td>Contact ID.</td>















     * </tr>















     * <tr>













     * <td>long</td>













     * <td>{@link #CONTACT_ID}</td>













     * <td>read-only</td>













     * <td>Contact ID.</td>













     * </tr>













     * <tr>













     * <td>long</td>













     * <td>{@link #DATA_ID}</td>













     * <td>read-only</td>













     * <td>Data ID.</td>













     * </tr>













     * <tr>















     * <td>String</td>















     * <td>{@link #LOOKUP_KEY}</td>















     * <td>read-only</td>