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

Commit 5781fec2 authored by Paul Soulos's avatar Paul Soulos Committed by Android (Google) Code Review
Browse files

Merge "Adds usage stat columns to Entity"

parents d1fdf023 42cdda83

api/current.txt

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

  }













  public static final class ContactsContract.Contacts.Entity implements android.provider.BaseColumns android.provider.ContactsContract.BaseSyncColumns android.provider.ContactsContract.ContactNameColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactStatusColumns android.provider.ContactsContract.ContactsColumns android.provider.ContactsContract.DataColumns android.provider.ContactsContract.RawContactsColumns android.provider.ContactsContract.StatusColumns android.provider.ContactsContract.SyncColumns {













  public static final class ContactsContract.Contacts.Entity implements android.provider.BaseColumns android.provider.ContactsContract.BaseSyncColumns android.provider.ContactsContract.ContactNameColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactStatusColumns android.provider.ContactsContract.ContactsColumns android.provider.ContactsContract.DataColumns android.provider.ContactsContract.DataUsageStatColumns android.provider.ContactsContract.RawContactsColumns android.provider.ContactsContract.StatusColumns android.provider.ContactsContract.SyncColumns {















    field public static final java.lang.String CONTENT_DIRECTORY = "entities";















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















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

























core/java/android/provider/ContactsContract.java



+1
−1




























Original line number
Diff line number
Diff line








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













         */















        public static final class Entity implements BaseColumns, ContactsColumns,















                ContactNameColumns, RawContactsColumns, BaseSyncColumns, SyncColumns, DataColumns,













                StatusColumns, ContactOptionsColumns, ContactStatusColumns {













                StatusColumns, ContactOptionsColumns, ContactStatusColumns, DataUsageStatColumns {















            /**















             * no public constructor since this is a utility class















             */