am 4cc16a7b: Merge change 20859 into donut

Merge commit '4cc16a7b9f146c4a324202db6b1777d2e0150fc3'

* commit '4cc16a7b9f146c4a324202db6b1777d2e0150fc3':
  Fix for sending 16-bit SMS message with header.
This commit is contained in:
jsh
2009-08-12 12:36:35 -07:00
committed by Android Git Automerger

View File

@@ -277,10 +277,12 @@ public class SmsMessage extends SmsMessageBase{
}
if (header != null) {
userData = new byte[header.length + textPart.length];
// Need 1 byte for UDHL
userData = new byte[header.length + textPart.length + 1];
System.arraycopy(header, 0, userData, 0, header.length);
System.arraycopy(textPart, 0, userData, header.length, textPart.length);
userData[0] = (byte)header.length;
System.arraycopy(header, 0, userData, 1, header.length);
System.arraycopy(textPart, 0, userData, header.length + 1, textPart.length);
}
else {
userData = textPart;