summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorBai Tao <michaelbai@google.com>2009-12-01 17:16:50 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-01 17:16:50 -0800
commita8c79a8c65f0b6ccd0e33b3b05060350381bbb7b (patch)
tree081374ebbeb4c5dd1884bb2025c435d1784c5d50 /telephony
parent77f17095ed17a6ccc7fc1f1b3ddb31c63bbf66a2 (diff)
parent90aaaef5f97ee885cc5898f3e7517ad4e5943d2f (diff)
downloadframeworks_base-a8c79a8c65f0b6ccd0e33b3b05060350381bbb7b.zip
frameworks_base-a8c79a8c65f0b6ccd0e33b3b05060350381bbb7b.tar.gz
frameworks_base-a8c79a8c65f0b6ccd0e33b3b05060350381bbb7b.tar.bz2
am 90aaaef5: Merge change I0e200c3c into eclair
Merge commit '90aaaef5f97ee885cc5898f3e7517ad4e5943d2f' into eclair-mr2 * commit '90aaaef5f97ee885cc5898f3e7517ad4e5943d2f': Sending UCS2 encoded SMS correctly
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/com/android/internal/telephony/gsm/SmsMessage.java1
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 ebd60a9..d627baf 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 ",