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

Commit c487e577 authored by Geoffrey Boullanger's avatar Geoffrey Boullanger Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "Remove FLAG_TELEPHONY_LOOKUP_MCC_EXTENSION after..."" into main

parents 42a13a50 207d1242

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

+1 −2
Original line number 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 boolean isNewMccTableEnabled() {

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

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

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

    }



    static {

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

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


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

    public static List<FlagsParameterization> getParams() {

        return FlagsParameterization.allCombinationsOf(

                Flags.FLAG_USE_I18N_FOR_MCC_MAPPING,

                com.android.icu.Flags.FLAG_TELEPHONY_LOOKUP_MCC_EXTENSION);

        return FlagsParameterization.allCombinationsOf(Flags.FLAG_USE_I18N_FOR_MCC_MAPPING);

    }



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

    public void telephonyFinder_shouldBeIdenticalToTelephonyMccTable() {

        assumeTrue(Flags.useI18nForMccMapping());

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



        TelephonyNetworkFinder telephonyNetworkFinder =

                TelephonyLookup.getInstance().getTelephonyNetworkFinder();