diff options
| author | Yorke Lee <yorkelee@google.com> | 2013-04-08 21:22:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-08 21:22:06 +0000 |
| commit | cf837a6e9034f0af3e58216578a1dad4cb635602 (patch) | |
| tree | 7580659fbbb2652f82a68e8d2f1b7ed023614b6c | |
| parent | 9e176c8b0e0770598469f4580e54ab1e47a06fe8 (diff) | |
| parent | 5a53d70428ea1ff4124df7161f9f16ef85e2a134 (diff) | |
| download | frameworks_base-cf837a6e9034f0af3e58216578a1dad4cb635602.zip frameworks_base-cf837a6e9034f0af3e58216578a1dad4cb635602.tar.gz frameworks_base-cf837a6e9034f0af3e58216578a1dad4cb635602.tar.bz2 | |
Merge "Update DataUsageStatColumns" into jb-mr2-dev
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 41 |
2 files changed, 1 insertions, 44 deletions
diff --git a/api/current.txt b/api/current.txt index 7fe166e..1e1f01c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -18504,10 +18504,6 @@ package android.provider { protected static abstract interface ContactsContract.DataUsageStatColumns { field public static final java.lang.String LAST_TIME_USED = "last_time_used"; field public static final java.lang.String TIMES_USED = "times_used"; - field public static final java.lang.String USAGE_TYPE = "usage_type"; - field public static final int USAGE_TYPE_CALL = 0; // 0x0 - field public static final int USAGE_TYPE_LONG_TEXT = 1; // 0x1 - field public static final int USAGE_TYPE_SHORT_TEXT = 2; // 0x2 } public static final class ContactsContract.Directory implements android.provider.BaseColumns { diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 66083c8..367d576 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -3796,50 +3796,11 @@ public final class ContactsContract { * Columns in the Data_Usage_Stat table */ protected interface DataUsageStatColumns { - /** What the referenced {@link Data} was used for. - * @see DataUsageStatColumns#USAGE_TYPE_CALL - * @see DataUsageStatColumns#USAGE_TYPE_LONG_TEXT - * @see DataUsageStatColumns#USAGE_TYPE_SHORT_TEXT - */ - public static final String USAGE_TYPE = "usage_type"; - /** The last time (in milliseconds) this {@link Data} was used. */ public static final String LAST_TIME_USED = "last_time_used"; - /** The number of times the referenced {@link Data} has been used for the purpose described - * in {@link DataUsageStatColumns#USAGE_TYPE}. - */ + /** The number of times the referenced {@link Data} has been used. */ public static final String TIMES_USED = "times_used"; - - /** - * Integer value for USAGE_TYPE. - * This type of usage refers to voice interaction, which includes phone calls, voice chat, - * and video chat. - * - * @see DataUsageFeedback#USAGE_TYPE - * @see DataUsageStatColumns#USAGE_TYPE - */ - public static final int USAGE_TYPE_CALL = 0; - - /** - * Integer value for USAGE_TYPE. - * This type of usage refers to text interaction involving longer messages, which includes - * email. - * - * @see DataUsageFeedback#USAGE_TYPE - * @see DataUsageStatColumns#USAGE_TYPE - */ - public static final int USAGE_TYPE_LONG_TEXT = 1; - - /** - * Integer value for USAGE_TYPE. - * This type of usage for text interaction involving shorter messages, which includes SMS - * and text chat with email addresses. - * - * @see DataUsageFeedback#USAGE_TYPE - * @see DataUsageStatColumns#USAGE_TYPE - */ - public static final int USAGE_TYPE_SHORT_TEXT = 2; } /** |