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

Commit 6a07f9fb authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 27301 into eclair

* changes:
  bug 2148061: if PduBody is zero length, treat it as an empty message.
parents ac939d08 c6b336d6
Loading
Loading
Loading
Loading
+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();