diff options
| author | Narayan Kamath <narayan@google.com> | 2014-07-04 08:23:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-04 08:02:36 +0000 |
| commit | 759e0d6a7a258dbc34a38a7db320827eb9144487 (patch) | |
| tree | a4e8766fed2818bfeabd43480897d66440281ec4 | |
| parent | a6e9dd3f9a2d966faf2d1710d2189127b968dc52 (diff) | |
| parent | 80b574199c5d06132acbcf640ec81f45f0d76ce3 (diff) | |
| download | frameworks_base-759e0d6a7a258dbc34a38a7db320827eb9144487.zip frameworks_base-759e0d6a7a258dbc34a38a7db320827eb9144487.tar.gz frameworks_base-759e0d6a7a258dbc34a38a7db320827eb9144487.tar.bz2 | |
Merge "Fix LocalePicker locale filtering."
| -rw-r--r-- | core/java/com/android/internal/app/LocalePicker.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/com/android/internal/app/LocalePicker.java b/core/java/com/android/internal/app/LocalePicker.java index 6973615..f5c498a 100644 --- 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; } |