diff options
| author | 2014-06-19 23:20:32 +0000 | |
|---|---|---|
| committer | 2014-06-19 22:33:55 +0000 | |
| commit | 5781fec20a3fd18a696704c8c7875f4df73633ee (patch) | |
| tree | 8d0ff7bd5df9994c0b26bcacaf08dc4e5e3e07eb | |
| parent | d1fdf0238a0008d2e4592667057e40721c41399a (diff) | |
| parent | 42cdda831ddc3731c2753cac0bdaa7710c78e1c8 (diff) | |
Merge "Adds usage stat columns to Entity"
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index e0e8ce9273d9..3b311e31ca0f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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"; diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 05937203eb75..8038a38062c6 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -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 */ |