am 058bd2e: am 1d4c4d4: am 44c1f01: Merge "Return error code when composing PDU fails"

Jean-Baptiste Queru · Android Git Automerger · commit 68e696b13786 · 2012-02-23T07:29:46.000-08:00
* commit '058bd2ecbcf8057511b00685eddc4ff5061bdbc1':
  Return error code when composing PDU fails
diff --git a/core/java/com/google/android/mms/pdu/PduComposer.java b/core/java/com/google/android/mms/pdu/PduComposer.java
@@ -835,9 +835,7 @@ private int makeSendReqPdu() {
         appendOctet(PduHeaders.CONTENT_TYPE);
 
         //  Message body
-        makeMessageBody();
-
-        return PDU_COMPOSE_SUCCESS;  // Composing the message is OK
+        return makeMessageBody();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -835,9 +835,7 @@ private int makeSendReqPdu() {`
`835`	`835`	`appendOctet(PduHeaders.CONTENT_TYPE);`
`836`	`836`
`837`	`837`	`// Message body`
`838`		`- makeMessageBody();`
`839`		`-`
`840`		`- return PDU_COMPOSE_SUCCESS; // Composing the message is OK`
	`838`	`+ return makeMessageBody();`
`841`	`839`	`}`
`842`	`840`
`843`	`841`	`/**`