Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5fe6c90 authored Feb 20, 2025 by Geoffrey Boullanger

Remove FLAG_TELEPHONY_LOOKUP_MCC_EXTENSION after full rollout

Bug: 376493245 
Test: atest still passing
Flag: EXEMPT removing com.android.icu.telephony_lookup_mcc_extension
Ignore-AOSP-First: removing flag
Change-Id: I4ab12ffe4afba69f8fcec87a4c4d05f6175df03d

parent 36664cac

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

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -336,8 +336,7 @@ public final class MccTable {
	public static final Map<Locale, Locale> FALLBACKS = new HashMap<Locale, Locale>();		public static final Map<Locale, Locale> FALLBACKS = new HashMap<Locale, Locale>();

	public static boolean isNewMccTableEnabled() {		public static boolean isNewMccTableEnabled() {
	return com.android.icu.Flags.telephonyLookupMccExtension()		return com.android.internal.telephony.flags.Flags.useI18nForMccMapping();
	&& com.android.internal.telephony.flags.Flags.useI18nForMccMapping();
	}		}

	static {		static {

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

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -56,9 +56,7 @@ public class MccTableTest {

	@Parameterized.Parameters(name = "{0}")		@Parameterized.Parameters(name = "{0}")
	public static List<FlagsParameterization> getParams() {		public static List<FlagsParameterization> getParams() {
	return FlagsParameterization.allCombinationsOf(		return FlagsParameterization.allCombinationsOf(Flags.FLAG_USE_I18N_FOR_MCC_MAPPING);
	Flags.FLAG_USE_I18N_FOR_MCC_MAPPING,
	com.android.icu.Flags.FLAG_TELEPHONY_LOOKUP_MCC_EXTENSION);
	}		}

	@Rule		@Rule
	@@ -155,7 +153,6 @@ public class MccTableTest {
	@Test		@Test
	public void telephonyFinder_shouldBeIdenticalToTelephonyMccTable() {		public void telephonyFinder_shouldBeIdenticalToTelephonyMccTable() {
	assumeTrue(Flags.useI18nForMccMapping());		assumeTrue(Flags.useI18nForMccMapping());
	assumeTrue(com.android.icu.Flags.telephonyLookupMccExtension());

	TelephonyNetworkFinder telephonyNetworkFinder =		TelephonyNetworkFinder telephonyNetworkFinder =
	TelephonyLookup.getInstance().getTelephonyNetworkFinder();		TelephonyLookup.getInstance().getTelephonyNetworkFinder();