Merge "Update DataUsageStatColumns" into jb-mr2-dev (cf837a6e) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -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 {

core/java/android/provider/ContactsContract.java

+1 −40

Original line number	Diff line number	Diff line
		@@ -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;
		}

		/**