Merge "Make English the default language for Indian SIMs" into nyc-mr1-dev (5e453f91) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/MccTable.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -124,10 +124,17 @@ public final class MccTable {
		return null;
		}

		final String country = entry.mIso;

		// Choose English as the default language for India.
		if ("in".equals(country)) {
		return "en";
		}

		// Ask CLDR for the language this country uses...
		Locale likelyLocale = ICU.addLikelySubtags(new Locale("und", entry.mIso));
		Locale likelyLocale = ICU.addLikelySubtags(new Locale("und", country));
		String likelyLanguage = likelyLocale.getLanguage();
		Slog.d(LOG_TAG, "defaultLanguageForMcc(" + mcc + "): country " + entry.mIso + " uses " +
		Slog.d(LOG_TAG, "defaultLanguageForMcc(" + mcc + "): country " + country + " uses " +
		likelyLanguage);
		return likelyLanguage;
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,13 @@ public class MccTableTest extends AndroidTestCase {
		assertEquals(MccTable.defaultLanguageForMcc(2000), null); // mcc not defined, hence default
		}

		@SmallTest
		public void testLang_India() throws Exception {
		assertEquals(MccTable.defaultLanguageForMcc(404), "en");
		assertEquals(MccTable.defaultLanguageForMcc(405), "en");
		assertEquals(MccTable.defaultLanguageForMcc(406), "en");
		}

		@SmallTest
		public void testSmDigits() throws Exception {
		assertEquals(MccTable.smallestDigitsMccForMnc(312), 3);