Support MBCS characters in contacts and SMS messages that are stored in SIM cards. (b55df447) · Commits · e / os / android_frameworks_base

core/res/res/values-mcc450-ko/config.xml

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		** Copyright 2010, The Android Open Source Project
		**
		** Licensed under the Apache License, Version 2.0 (the "License");
		** you may not use this file except in compliance with the License.
		** You may obtain a copy of the License at
		**
		** http://www.apache.org/licenses/LICENSE-2.0
		**
		** Unless required by applicable law or agreed to in writing, software
		** distributed under the License is distributed on an "AS IS" BASIS,
		** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		** See the License for the specific language governing permissions and
		** limitations under the License.
		*/
		-->
		<resources>
		<string name="gsm_alphabet_default_charset">euc-kr</string>
		</resources>

core/res/res/values/config.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -405,4 +405,8 @@

		<!-- IP address of the dns server to use if nobody else suggests one -->
		<string name="config_default_dns_server">8.8.8.8</string>

		<!-- The default character set for GsmAlphabet -->
		<!-- Empty string means MBCS is not considered -->
		<string name="gsm_alphabet_default_charset"></string>
		</resources>

telephony/java/android/telephony/SmsMessage.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,10 @@ public class SmsMessage {
		public static final int ENCODING_7BIT = 1;
		public static final int ENCODING_8BIT = 2;
		public static final int ENCODING_16BIT = 3;
		/**
		* @hide This value is not defined in global standard. Only in Korea, this is used.
		*/
		public static final int ENCODING_KSC5601 = 4;

		/** The maximum number of payload bytes per message */
		public static final int MAX_USER_DATA_BYTES = 140;

telephony/java/com/android/internal/telephony/GsmAlphabet.java

+39 −1

Original line number	Diff line number	Diff line
		@@ -16,10 +16,14 @@

		package com.android.internal.telephony;

		import android.text.TextUtils;
		import android.util.SparseIntArray;

		import android.util.Log;

		import java.nio.ByteBuffer;
		import java.nio.charset.Charset;

		/**
		* This class implements the character set mapping between
		* the GSM SMS 7-bit alphabet specified in TS 23.038 6.2.1
		@@ -354,6 +358,32 @@ public class GsmAlphabet {
		*/
		public static String
		gsm8BitUnpackedToString(byte[] data, int offset, int length) {
		return gsm8BitUnpackedToString(data, offset, length, "");
		}

		/**
		* Convert a GSM alphabet string that's stored in 8-bit unpacked
		* format (as it often appears in SIM records) into a String
		*
		* Field may be padded with trailing 0xff's. The decode stops
		* at the first 0xff encountered.
		*
		* Additionally, in some country(ex. Korea), there are non-ASCII or MBCS characters.
		* If a character set is given, characters in data are treat as MBCS.
		*/
		public static String
		gsm8BitUnpackedToString(byte[] data, int offset, int length, String characterset) {
		boolean isMbcs = false;
		Charset charset = null;
		ByteBuffer mbcsBuffer = null;

		if (!TextUtils.isEmpty(characterset)
		&& !characterset.equalsIgnoreCase("us-ascii")
		&& Charset.isSupported(characterset)) {
		isMbcs = true;
		charset = Charset.forName(characterset);
		mbcsBuffer = ByteBuffer.allocate(2);
		}
		boolean prevWasEscape;
		StringBuilder ret = new StringBuilder(length);

		@@ -379,7 +409,15 @@ public class GsmAlphabet {
		if (prevWasEscape) {
		ret.append((char)gsmExtendedToChar.get(c, ' '));
		} else {
		if (!isMbcs \|\| c < 0x80 \|\| i + 1 >= offset + length) {
		ret.append((char)gsmToChar.get(c, ' '));
		} else {
		// isMbcs must be true. So both mbcsBuffer and charset are initialized.
		mbcsBuffer.clear();
		mbcsBuffer.put(data, i++, 2);
		mbcsBuffer.flip();
		ret.append(charset.decode(mbcsBuffer).toString());
		}
		}
		prevWasEscape = false;
		}

telephony/java/com/android/internal/telephony/IccUtils.java

+16 −2

Original line number	Diff line number	Diff line
		@@ -16,13 +16,16 @@

		package com.android.internal.telephony;

		import android.content.res.Resources;
		import android.content.res.Resources.NotFoundException;
		import android.graphics.Bitmap;
		import android.graphics.Color;
		import android.util.Log;

		import com.android.internal.telephony.GsmAlphabet;

		import java.io.UnsupportedEncodingException;
		import java.nio.ByteBuffer;
		import java.nio.charset.Charset;

		/**
		* Various methods, useful for dealing with SIM data.
		@@ -150,6 +153,9 @@ public class IccUtils {
		*/
		public static String
		adnStringFieldToString(byte[] data, int offset, int length) {
		if (length == 0) {
		return "";
		}
		if (length >= 1) {
		if (data[offset] == (byte) 0x80) {
		int ucslen = (length - 1) / 2;
		@@ -225,7 +231,15 @@ public class IccUtils {
		return ret.toString();
		}

		return GsmAlphabet.gsm8BitUnpackedToString(data, offset, length);
		Resources resource = Resources.getSystem();
		String defaultCharset = "";
		try {
		defaultCharset =
		resource.getString(com.android.internal.R.string.gsm_alphabet_default_charset);
		} catch (NotFoundException e) {
		// Ignore Exception and defaultCharset is set to a empty string.
		}
		return GsmAlphabet.gsm8BitUnpackedToString(data, offset, length, defaultCharset.trim());
		}

		static int