diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-12-10 10:56:31 +0900 |
|---|---|---|
| committer |   Tadashi G. Takaoka <takaoka@google.com> | 2013-12-11 13:27:46 +0900 |
| commit | 423422c437de5f9d49f51a67079722ad57c58717 (patch) | |
| tree | 0391e148f904232690fec1ba968ef01464d6c245 /java/src/com/android/inputmethod/latin/utils/LocaleUtils.java | |
| parent | 7c8075c2aca45ab60418c4e3b02a510f153b090d (diff) | |
| download | latinime-423422c437de5f9d49f51a67079722ad57c58717.tar.gz latinime-423422c437de5f9d49f51a67079722ad57c58717.tar.xz latinime-423422c437de5f9d49f51a67079722ad57c58717.zip | |
Rename deprecated locale directories
cf. Ibe392f5f9dbc82c3cdff8e06b958bc3bcce3fa82
Also, cf. bug id 11340849
Change-Id: I43e84f8ca04eb1aa74037a705970a36434429a0f
Diffstat (limited to 'java/src/com/android/inputmethod/latin/utils/LocaleUtils.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/utils/LocaleUtils.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/utils/LocaleUtils.java b/java/src/com/android/inputmethod/latin/utils/LocaleUtils.java index b4ff849f1..0c55484b4 100644 --- a/java/src/com/android/inputmethod/latin/utils/LocaleUtils.java +++ b/java/src/com/android/inputmethod/latin/utils/LocaleUtils.java @@ -165,12 +165,14 @@ public final class LocaleUtils { * Creates a locale from a string specification. */ public static Locale constructLocaleFromString(final String localeStr) { - if (localeStr == null) + if (localeStr == null) { return null; + } synchronized (sLocaleCache) { - if (sLocaleCache.containsKey(localeStr)) - return sLocaleCache.get(localeStr); - Locale retval = null; + Locale retval = sLocaleCache.get(localeStr); + if (retval != null) { + return retval; + } String[] localeParams = localeStr.split("_", 3); if (localeParams.length == 1) { retval = new Locale(localeParams[0]); |