Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6a07f9fb: Merge change 27301 into eclair

Browse Source 
Merge commit '6a07f9fbe9f270795d3338415ca03a3333ec50e3' into eclair-plus-aosp

* commit '6a07f9fbe9f270795d3338415ca03a3333ec50e3':
  bug 2148061: if PduBody is zero length, treat it as an empty message.
This commit is contained in:
Wei Huang
2009-09-27 14:12:56 -07:00
committed by Android Git Automerger
parent a1414d1c5b 6a07f9fbe9
commit 7df612ceb9
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/google/android/mms/pdu/PduComposer.java
View File

@@ -850,8 +850,7 @@ public class PduComposer {
PositionMarker ctStart = mStack.mark(); PositionMarker ctStart = mStack.mark();
// This contentTypeIdentifier should be used for type of attachment... // This contentTypeIdentifier should be used for type of attachment...
String contentType = new String( String contentType = new String(mPduHeader.getTextString(PduHeaders.CONTENT_TYPE));
mPduHeader.getTextString(PduHeaders.CONTENT_TYPE));
Integer contentTypeIdentifier = mContentTypeMap.get(contentType); Integer contentTypeIdentifier = mContentTypeMap.get(contentType);
if (contentTypeIdentifier == null) { if (contentTypeIdentifier == null) {
// content type is mandatory // content type is mandatory
@@ -862,7 +861,7 @@ public class PduComposer {
// content-type parameter: start // content-type parameter: start
PduBody body = ((SendReq) mPdu).getBody(); PduBody body = ((SendReq) mPdu).getBody();
if (null == body) { if (null == body || body.getPartsNum() == 0) {
// empty message // empty message
appendUintvarInteger(0); appendUintvarInteger(0);
mStack.pop(); mStack.pop();