Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update DataUsageStatColumns" into jb-mr2-dev

Browse Source
This commit is contained in:
Yorke Lee
2013-04-08 21:22:06 +00:00
committed by Android (Google) Code Review
parent 9e176c8b0e 5a53d70428
commit cf837a6e90
2 changed files with 1 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -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 {

41
core/java/android/provider/ContactsContract.java
View File

@@ -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;
}
/**