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

Merge "Fix special handling of a fake language code "tl"."

Browse Source
This commit is contained in:
Yohei Yukawa
2015-12-03 19:04:24 +00:00
committed by Gerrit Code Review
parent 0ded0da517 ed65bc0c62
commit 9fd2af6b32
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/inputmethod/InputMethodUtils.java
View File

@@ -377,9 +377,6 @@ public class InputMethodUtils {
} }
// TODO: Use {@link Locale#toLanguageTag()} and {@link Locale#forLanguageTag(languageTag)}. // TODO: Use {@link Locale#toLanguageTag()} and {@link Locale#forLanguageTag(languageTag)}.
String[] localeParams = localeStr.split("_", 3); String[] localeParams = localeStr.split("_", 3);
// The length of localeStr is guaranteed to always return a 1 <= value <= 3
// because localeStr is not empty.
if (localeParams.length == 1) {
if (localeParams.length >= 1 && "tl".equals(localeParams[0])) { if (localeParams.length >= 1 && "tl".equals(localeParams[0])) {
// Convert a locale whose language is "tl" to one whose language is "fil". // Convert a locale whose language is "tl" to one whose language is "fil".
// For example, "tl_PH" will get converted to "fil_PH". // For example, "tl_PH" will get converted to "fil_PH".
@@ -388,6 +385,9 @@ public class InputMethodUtils {
// On Lollipop and above, the current three letter version must be used. // On Lollipop and above, the current three letter version must be used.
localeParams[0] = "fil"; localeParams[0] = "fil";
} }
// The length of localeStr is guaranteed to always return a 1 <= value <= 3
// because localeStr is not empty.
if (localeParams.length == 1) {
return new Locale(localeParams[0]); return new Locale(localeParams[0]);
} else if (localeParams.length == 2) { } else if (localeParams.length == 2) {
return new Locale(localeParams[0], localeParams[1]); return new Locale(localeParams[0], localeParams[1]);