Merge change I0e200c3c into eclair

* changes:
  Sending UCS2 encoded SMS correctly

1 files changed, 1 insertions, 0 deletions

diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
index ebd60a99207f..d627bafbafe9 100644
--- a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
+++ b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
@@ -280,6 +280,7 @@ public class SmsMessage extends SmsMessageBase{
             // send it as a UCS-2 encoded message
             try {
                 userData = encodeUCS2(message, header);
+                encoding = ENCODING_16BIT;
             } catch(UnsupportedEncodingException uex) {
                 Log.e(LOG_TAG,
                         "Implausible UnsupportedEncodingException ",