Merge "MMS API cleanup (2/4)" into lmp-dev (dcef1a4b) · Commits · e / os / android_frameworks_opt_telephony

src/java/android/telephony/SmsManager.java

+21 −8

Original line number	Diff line number	Diff line
		@@ -918,7 +918,7 @@ public final class SmsManager {
		* @throws IllegalArgumentException if contentUri is empty
		*/
		public void sendMultimediaMessage(Uri contentUri, String locationUrl,
		ContentValues configOverrides, PendingIntent sentIntent) {
		Bundle configOverrides, PendingIntent sentIntent) {
		if (contentUri == null) {
		throw new IllegalArgumentException("Uri contentUri null");
		}
		@@ -947,7 +947,7 @@ public final class SmsManager {
		* @throws IllegalArgumentException if locationUrl or contentUri is empty
		*/
		public void downloadMultimediaMessage(String locationUrl, Uri contentUri,
		ContentValues configOverrides, PendingIntent downloadedIntent) {
		Bundle configOverrides, PendingIntent downloadedIntent) {
		if (TextUtils.isEmpty(locationUrl)) {
		throw new IllegalArgumentException("Empty MMS location URL");
		}
		@@ -974,7 +974,7 @@ public final class SmsManager {
		public static final int MMS_ERROR_IO_ERROR = 5;

		// Intent extra name for result data
		public static final String MMS_EXTRA_DATA = "data";
		public static final String EXTRA_MMS_DATA = "android.telephony.extra.MMS_DATA";

		/**
		* Update the status of a pending (send-by-IP) MMS message handled by the carrier app.
		@@ -1035,6 +1035,7 @@ public final class SmsManager {
		* @param seen if the message is seen
		* @param read if the message is read
		* @return the message URI, null if failed
		* @hide
		*/
		public Uri importTextMessage(String address, int type, String text, long timestampMillis,
		boolean seen, boolean read) {
		@@ -1050,9 +1051,9 @@ public final class SmsManager {
		return null;
		}

		/** Represents the received SMS message for importing */
		/** Represents the received SMS message for importing {@hide} */
		public static final int SMS_TYPE_INCOMING = 0;
		/** Represents the sent SMS message for importing */
		/** Represents the sent SMS message for importing {@hide} */
		public static final int SMS_TYPE_OUTGOING = 1;

		/**
		@@ -1068,6 +1069,7 @@ public final class SmsManager {
		* @param read if the message is read
		* @return the message URI, null if failed
		* @throws IllegalArgumentException if pdu is empty
		* {@hide}
		*/
		public Uri importMultimediaMessage(Uri contentUri, String messageId, long timestampSecs,
		boolean seen, boolean read) {
		@@ -1094,6 +1096,7 @@ public final class SmsManager {
		* @param messageUri the URI of the stored message
		* @return true if deletion is successful, false otherwise
		* @throws IllegalArgumentException if messageUri is empty
		* {@hide}
		*/
		public boolean deleteStoredMessage(Uri messageUri) {
		if (messageUri == null) {
		@@ -1117,6 +1120,7 @@ public final class SmsManager {
		*
		* @param conversationId the ID of the message conversation
		* @return true if deletion is successful, false otherwise
		* {@hide}
		*/
		public boolean deleteStoredConversation(long conversationId) {
		try {
		@@ -1139,6 +1143,7 @@ public final class SmsManager {
		* @param statusValues a list of status properties in key-value pairs to update
		* @return true if update is successful, false otherwise
		* @throws IllegalArgumentException if messageUri is empty
		* {@hide}
		*/
		public boolean updateStoredMessageStatus(Uri messageUri, ContentValues statusValues) {
		if (messageUri == null) {
		@@ -1156,9 +1161,9 @@ public final class SmsManager {
		return false;
		}

		/** Message status property: whether the message has been seen. 1 means seen, 0 not*/
		/** Message status property: whether the message has been seen. 1 means seen, 0 not {@hide} */
		public static final String MESSAGE_STATUS_SEEN = "seen";
		/** Message status property: whether the message has been read. 1 means read, 0 not*/
		/** Message status property: whether the message has been read. 1 means read, 0 not {@hide} */
		public static final String MESSAGE_STATUS_READ = "read";

		/**
		@@ -1167,6 +1172,7 @@ public final class SmsManager {
		* @param conversationId the ID of the message conversation
		* @param archived true to archive the conversation, false to unarchive
		* @return true if update is successful, false otherwise
		* {@hide}
		*/
		public boolean archiveStoredConversation(long conversationId, boolean archived) {
		try {
		@@ -1189,6 +1195,7 @@ public final class SmsManager {
		* @param address the destination address of message
		* @param text the body of the message to send
		* @return the URI of the stored draft message
		* {@hide}
		*/
		public Uri addTextMessageDraft(String address, String text) {
		try {
		@@ -1210,6 +1217,7 @@ public final class SmsManager {
		* @param contentUri the content uri from which to read the PDU data of the draft MMS
		* @return the URI of the stored draft message
		* @throws IllegalArgumentException if pdu is empty
		* {@hide}
		*/
		public Uri addMultimediaMessageDraft(Uri contentUri) {
		if (contentUri == null) {
		@@ -1252,6 +1260,7 @@ public final class SmsManager {
		* raw pdu of the status report is in the extended data ("pdu").
		*
		* @throws IllegalArgumentException if messageUri is empty
		* {@hide}
		*/
		public void sendStoredTextMessage(Uri messageUri, String scAddress, PendingIntent sentIntent,
		PendingIntent deliveryIntent) {
		@@ -1298,6 +1307,7 @@ public final class SmsManager {
		* extended data ("pdu").
		*
		* @throws IllegalArgumentException if messageUri is empty
		* {@hide}
		*/
		public void sendStoredMultipartTextMessage(Uri messageUri, String scAddress,
		ArrayList<PendingIntent> sentIntents, ArrayList<PendingIntent> deliveryIntents) {
		@@ -1325,8 +1335,9 @@ public final class SmsManager {
		* @param sentIntent if not NULL this <code>PendingIntent</code> is
		* broadcast when the message is successfully sent, or failed
		* @throws IllegalArgumentException if messageUri is empty
		* {@hide}
		*/
		public void sendStoredMultimediaMessage(Uri messageUri, ContentValues configOverrides,
		public void sendStoredMultimediaMessage(Uri messageUri, Bundle configOverrides,
		PendingIntent sentIntent) {
		if (messageUri == null) {
		throw new IllegalArgumentException("Empty message URI");
		@@ -1352,6 +1363,7 @@ public final class SmsManager {
		* This flag can only be changed by default SMS apps
		*
		* @param enabled Whether to enable message auto persisting
		* {@hide}
		*/
		public void setAutoPersisting(boolean enabled) {
		try {
		@@ -1372,6 +1384,7 @@ public final class SmsManager {
		* automatically
		*
		* @return the current value of the auto persist flag
		* {@hide}
		*/
		public boolean getAutoPersisting() {
		try {