Merge change I0e200c3c into eclair

* changes: Sending UCS2 encoded SMS correctly
2009-11-30 16:35:18 -08:00
parent 533a280350 0e200c3cbe
commit 90aaaef5f9
1 changed files with 1 additions and 0 deletions
--- 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 ",