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

Commit ae019316 authored by Calvin On's avatar Calvin On Committed by Android (Google) Code Review
Browse files

Merge "Revert "Remove FLAG_TELEPHONY_LOOKUP_MCC_EXTENSION after full ro..."" into main

parents 1a2ff259 81c2eb62

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

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



    public static boolean isNewMccTableEnabled() {

        return com.android.internal.telephony.flags.Flags.useI18nForMccMapping();

        return com.android.icu.Flags.telephonyLookupMccExtension()

                && com.android.internal.telephony.flags.Flags.useI18nForMccMapping();

    }



    static {

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

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


    @Parameterized.Parameters(name = "{0}")

    public static List<FlagsParameterization> getParams() {

        return FlagsParameterization.allCombinationsOf(Flags.FLAG_USE_I18N_FOR_MCC_MAPPING);

        return FlagsParameterization.allCombinationsOf(

                Flags.FLAG_USE_I18N_FOR_MCC_MAPPING,

                com.android.icu.Flags.FLAG_TELEPHONY_LOOKUP_MCC_EXTENSION);

    }



    @Rule
@@ -153,6 +155,7 @@ public class MccTableTest { 
    @Test

    public void telephonyFinder_shouldBeIdenticalToTelephonyMccTable() {

        assumeTrue(Flags.useI18nForMccMapping());

        assumeTrue(com.android.icu.Flags.telephonyLookupMccExtension());



        TelephonyNetworkFinder telephonyNetworkFinder =

                TelephonyLookup.getInstance().getTelephonyNetworkFinder();