Merge "telephony: Support for KSC5601 on SIM." into ics (72c57da6) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/AdnRecord.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -283,7 +283,7 @@ public class AdnRecord implements Parcelable {
		private void
		parseRecord(byte[] record) {
		try {
		alphaTag = IccUtils.adnStringFieldToString(
		alphaTag = IccUtils.adnStringFieldToStringKsc5601Support(
		record, 0, record.length - FOOTER_SIZE_BYTES);

		int footerOffset = record.length - FOOTER_SIZE_BYTES;

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

+45 −0

Original line number	Diff line number	Diff line
		@@ -176,6 +176,47 @@ public class IccUtils {
		*/
		public static String
		adnStringFieldToString(byte[] data, int offset, int length) {
		String s = adnStringFieldToStringUcs2Helper(data, offset, length);
		if (s == null) {
		s = adnStringFieldToStringGsm8BitHelper(data, offset, length);
		}
		return s;
		}

		/**
		* Almost identical to the method {@link #adnStringFieldToString}.
		*
		* Exception:
		* If the SIM is Korean (MCC equals "450"), KSC5601 encoding will be
		* assumed (instead of GSM8Bit). This could lead to unintended consequences,
		* if the ADN alphaTag was saved with GSM8Bit. This is considered an
		* acceptable risk.
		*/
		public static String
		adnStringFieldToStringKsc5601Support(byte[] data, int offset, int length) {
		String s = adnStringFieldToStringUcs2Helper(data, offset, length);

		if (s == null) {
		if (SimRegionCache.getRegion() == SimRegionCache.MCC_KOREAN) {
		try {
		int len = offset;
		byte stop = (byte)0xFF;
		while (len < length && data[len] != stop) {
		len++;
		}
		return new String(data, offset, len, "KSC5601");
		} catch (UnsupportedEncodingException e) {
		Log.e(LOG_TAG, "implausible UnsupportedEncodingException", e);
		}
		}

		return adnStringFieldToStringGsm8BitHelper(data, offset, length);
		}
		return s;
		}

		private static String
		adnStringFieldToStringUcs2Helper(byte[] data, int offset, int length) {
		if (length == 0) {
		return "";
		}
		@@ -253,7 +294,11 @@ public class IccUtils {

		return ret.toString();
		}
		return null;
		}

		private static String
		adnStringFieldToStringGsm8BitHelper(byte[] data, int offset, int length) {
		Resources resource = Resources.getSystem();
		String defaultCharset = "";
		try {

telephony/java/com/android/internal/telephony/SimRegionCache.java

0 → 100644

+51 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 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.
		*/

		package com.android.internal.telephony;

		import android.os.SystemProperties;

		public class SimRegionCache {
		public static final int MCC_UNSET = Integer.MIN_VALUE;
		public static final int MCC_KOREAN = 450;

		private static int regionFromMcc = MCC_UNSET;

		/**
		* Returns the region as read from the MCC of the SIM card.
		* If the property {@link TelephonyProperties#
		* PROPERTY_ICC_OPERATOR_NUMERIC}
		* returns null or an empty String, the value is {@link #MCC_UNSET}
		*
		* @return the cached region, if set.
		*/
		public static int getRegion() {
		if (regionFromMcc == MCC_UNSET) {
		String plmn = SystemProperties.get(
		TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC,
		null);

		if (plmn != null && plmn.length() >= 3) {
		try {
		regionFromMcc = Integer.parseInt(plmn.substring(0, 3));
		} catch(Exception e) {
		// Nothing that can be done here.
		}
		}
		}
		return regionFromMcc;
		}
		}

telephony/java/com/android/internal/telephony/gsm/SmsMessage.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.util.Log;

		import com.android.internal.telephony.EncodeException;
		import com.android.internal.telephony.GsmAlphabet;
		import com.android.internal.telephony.SimRegionCache;
		import com.android.internal.telephony.IccUtils;
		import com.android.internal.telephony.SmsHeader;
		import com.android.internal.telephony.SmsMessageBase;
		@@ -1043,6 +1044,10 @@ public class SmsMessage extends SmsMessageBase {
		Log.w(LOG_TAG, "1 - Unsupported SMS data coding scheme "
		+ (dataCodingScheme & 0xff));
		encodingType = ENCODING_8BIT;
		if (SimRegionCache.getRegion() == SimRegionCache.MCC_KOREAN) {
		Log.w(LOG_TAG, "Korean SIM, using KSC5601 for decoding.");
		encodingType = ENCODING_KSC5601;
		}
		break;
		}
		}
		@@ -1101,6 +1106,10 @@ public class SmsMessage extends SmsMessageBase {
		} else {
		Log.w(LOG_TAG, "3 - Unsupported SMS data coding scheme "
		+ (dataCodingScheme & 0xff));
		if (SimRegionCache.getRegion() == SimRegionCache.MCC_KOREAN) {
		Log.w(LOG_TAG, "Korean SIM, using KSC5601 for decoding.");
		encodingType = ENCODING_KSC5601;
		}
		}

		// set both the user data and the user data header.

telephony/tests/telephonytests/src/com/android/internal/telephony/AdnRecordTest.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -170,6 +170,18 @@ public class AdnRecordTest extends TestCase {
		assertEquals("Adgjm", adn.getAlphaTag());
		assertEquals("+18885551212,12345678", adn.getNumber());
		assertFalse(adn.isEmpty());

		//
		// Test that a ADN record with KSC5601 will get converted correctly
		// This test will only be run when using a Korean SIM
		//
		if (SimRegionCache.getRegion() == SimRegionCache.MCC_KOREAN) {
		adn = new AdnRecord(IccUtils.hexStringToBytes(
		"3030312C20C8AB41B1E6FFFFFFFFFFFF07811010325476F8FFFFFFFFFFFF"));
		assertEquals("001, \uD64DA\uAE38", adn.getAlphaTag());
		assertEquals("01012345678", adn.getNumber());
		assertFalse(adn.isEmpty());
		}
		}
		}