Merge "Fix incorrect descriptions under SMS contract" am: 8f48cb7e7e am: 6ef5b6c183 am: 4e16f07ddf (b6d51f11) · Commits · e / os / android_frameworks_base

telephony/java/android/provider/Telephony.java

+10 −2

Original line number	Original line	Diff line number	Diff line
	@@ -693,7 +693,7 @@ public final class Telephony {
	}		}

	/**		/**
	* Contains all sent text-based SMS messages in the SMS app.		* Contains all draft text-based SMS messages in the SMS app.
	*/		*/
	public static final class Draft implements BaseColumns, TextBasedSmsColumns {		public static final class Draft implements BaseColumns, TextBasedSmsColumns {

	@@ -809,7 +809,15 @@ public final class Telephony {
	}		}

	/**		/**
	* Contains all sent text-based SMS messages in the SMS app.		* Contains a view of SMS conversations (also referred to as threads). This is similar to
			* {@link Threads}, but only includes SMS messages and columns relevant to SMS
			* conversations.
			* <p>
			* Note that this view ignores any information about MMS messages, it is a
			* view of conversations as if MMS messages did not exist at all. This means that all
			* relevant information, such as snippets and message count, will ignore any MMS messages
			* that might be in the same thread through other views and present only data based on the
			* SMS messages in that thread.
	*/		*/
	public static final class Conversations		public static final class Conversations
	implements BaseColumns, TextBasedSmsColumns {		implements BaseColumns, TextBasedSmsColumns {