Merge "Fix LocalePicker locale filtering."

2014-07-04 08:23:08 +00:00
parent a6e9dd3f9a 80b574199c
commit 759e0d6a7a
1 changed files with 2 additions and 1 deletions
--- a/core/java/com/android/internal/app/LocalePicker.java
+++ b/core/java/com/android/internal/app/LocalePicker.java
@@ -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;
            }