From 7f304d2cce936ac273aaa4d1ee998292ba5755f4 Mon Sep 17 00:00:00 2001
From: jsh <jsh@google.com>
Date: Tue, 11 Aug 2009 17:25:37 -0700
Subject: [PATCH] Fix for sending 16-bit SMS message with header.

Header length was missing from the PDU.  This addresses http://b/issue?id=2040561
---
 .../com/android/internal/telephony/gsm/SmsMessage.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
index f1207e4ad6001..af591268d99ee 100644
--- a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
+++ b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
@@ -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;