diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-12-10 22:03:58 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-12-10 22:03:58 -0800 |
| commit | 8d9ae1c41f9f5f63f9c20d6a5a9203ac6df5320f (patch) | |
| tree | 1031e2b9e32879a5bb49706b1971148cd33b9cc7 /java/src/com/android/inputmethod/latin/utils | |
| parent | cb5fac22329eb90d150d4a3bf99938e921db8c2a (diff) | |
| parent | 0a190a389f044143262b07b9a6b4422b2d462d1b (diff) | |
| download | latinime-8d9ae1c41f9f5f63f9c20d6a5a9203ac6df5320f.tar.gz latinime-8d9ae1c41f9f5f63f9c20d6a5a9203ac6df5320f.tar.xz latinime-8d9ae1c41f9f5f63f9c20d6a5a9203ac6df5320f.zip | |
am 0a190a38: Merge "Rename deprecated locale directories"
* commit '0a190a389f044143262b07b9a6b4422b2d462d1b':
Rename deprecated locale directories
Diffstat (limited to 'java/src/com/android/inputmethod/latin/utils')
| -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]); |