Merge change 25666 into eclair (da05aa82) · Commits · e / os / android_frameworks_base

core/java/com/google/android/mms/pdu/PduPersister.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -810,7 +810,7 @@ public class PduPersister {
		public void updateHeaders(Uri uri, SendReq sendReq) {
		PDU_CACHE_INSTANCE.purge(uri);

		ContentValues values = new ContentValues(9);
		ContentValues values = new ContentValues(10);
		byte[] contentType = sendReq.getContentType();
		if (contentType != null) {
		values.put(Mms.CONTENT_TYPE, toIsoString(contentType));
		@@ -857,6 +857,11 @@ public class PduPersister {
		values.put(Mms.SUBJECT_CHARSET, subject.getCharacterSet());
		}

		long messageSize = sendReq.getMessageSize();
		if (messageSize > 0) {
		values.put(Mms.MESSAGE_SIZE, messageSize);
		}

		PduHeaders headers = sendReq.getPduHeaders();
		HashSet<String> recipients = new HashSet<String>();
		for (int addrType : ADDRESS_FIELDS) {

+20 −0

Original line number	Diff line number	Diff line
		@@ -205,6 +205,26 @@ public class SendReq extends MultimediaMessagePdu {
		mPduHeaders.setLongInteger(value, PduHeaders.EXPIRY);
		}

		/**
		* Get X-Mms-MessageSize value.
		*
		* Expiry-value = size of message
		*
		* @return the value
		*/
		public long getMessageSize() {
		return mPduHeaders.getLongInteger(PduHeaders.MESSAGE_SIZE);
		}

		/**
		* Set X-Mms-MessageSize value.
		*
		* @param value the value
		*/
		public void setMessageSize(long value) {
		mPduHeaders.setLongInteger(value, PduHeaders.MESSAGE_SIZE);
		}

		/**
		* Get From value.
		* From-value = Value-length