From c6b336d6a411ceacba4aa0dab9a01a5083729c71 Mon Sep 17 00:00:00 2001
From: Wei Huang <weih@google.com>
Date: Sun, 27 Sep 2009 13:32:24 -0700
Subject: [PATCH] bug 2148061: if PduBody is zero length, treat it as an empty
 message.

Change-Id: I2f352dd481f6b8d02b67cd3a44d692e3a5d03999
---
 core/java/com/google/android/mms/pdu/PduComposer.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/java/com/google/android/mms/pdu/PduComposer.java b/core/java/com/google/android/mms/pdu/PduComposer.java
index 2aa5e48f507ee..8940945a605a0 100644
--- a/core/java/com/google/android/mms/pdu/PduComposer.java
+++ b/core/java/com/google/android/mms/pdu/PduComposer.java
@@ -850,8 +850,7 @@ public class PduComposer {
         PositionMarker ctStart = mStack.mark();
 
         // This contentTypeIdentifier should be used for type of attachment...
-        String contentType = new String(
-                mPduHeader.getTextString(PduHeaders.CONTENT_TYPE));
+        String contentType = new String(mPduHeader.getTextString(PduHeaders.CONTENT_TYPE));
         Integer contentTypeIdentifier = mContentTypeMap.get(contentType);
         if (contentTypeIdentifier == null) {
             // content type is mandatory
@@ -862,7 +861,7 @@ public class PduComposer {
 
         // content-type parameter: start
         PduBody body = ((SendReq) mPdu).getBody();
-        if (null == body) {
+        if (null == body || body.getPartsNum() == 0) {
             // empty message
             appendUintvarInteger(0);
             mStack.pop();