Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6b336d6 authored by Wei Huang's avatar Wei Huang
Browse files

bug 2148061: if PduBody is zero length, treat it as an empty message. 

Change-Id: I2f352dd481f6b8d02b67cd3a44d692e3a5d03999
parent e7d60bfd

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

+2 −3
Original line number Diff line number Diff line
@@ -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();