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

Commit 1359908d authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 0cf2e65d: am 5ae312fb: am 759e0d6a: Merge "Fix LocalePicker locale filtering." 

* commit '0cf2e65d':
  Fix LocalePicker locale filtering.
parents 4fe3e475 0cf2e65d

core/java/com/android/internal/app/LocalePicker.java

+2 −1
Original line number Diff line number Diff line
@@ -131,7 +131,8 @@ public class LocalePicker extends ListFragment { 
        final ArrayList<LocaleInfo> localeInfos = new ArrayList<LocaleInfo>(localeList.size());

        for (String locale : localeList) {

            final Locale l = Locale.forLanguageTag(locale.replace('_', '-'));

            if (l == null || "und".equals(l.getLanguage())) {

            if (l == null || "und".equals(l.getLanguage())

                    || l.getLanguage().isEmpty() || l.getCountry().isEmpty()) {

                continue;

            }