Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '5ae312fb5b601d2c60e197f94c6a292700776140':
  Fix LocalePicker locale filtering.
This commit is contained in:
Narayan Kamath
2014-07-04 09:22:57 +00:00
committed by Android Git Automerger
parent 51d70ce9b8 5ae312fb5b
commit 0cf2e65dc0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/app/LocalePicker.java
View File

@@ -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;
}