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

Commit c3202184 authored by Allen Su's avatar Allen Su Committed by Android (Google) Code Review
Browse files

Merge "Fix unnecessary dialog" into main

parents d829ec46 caf664cd

src/com/android/settings/regionalpreferences/RegionPickerBaseListPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ public abstract class RegionPickerBaseListPreferenceController extends BasePrefe 


    private List<LocaleStore.LocaleInfo> getSortedLocaleList(

            List<LocaleStore.LocaleInfo> localeInfos) {

        final Locale sortingLocale = Locale.getDefault();

        final Locale sortingLocale = LocaleList.getDefault().get(0);

        final LocaleHelper.LocaleInfoComparator comp =

                new LocaleHelper.LocaleInfoComparator(sortingLocale, true);

        Collections.sort(localeInfos, comp);
@@ -162,7 +162,7 @@ public abstract class RegionPickerBaseListPreferenceController extends BasePrefe 
    }



    private void switchRegion(LocaleStore.LocaleInfo localeInfo) {

        if (localeInfo.getLocale().equals(Locale.getDefault())) {

        if (localeInfo.getLocale().equals(LocaleList.getDefault().get(0))) {

            return;

        }