From 423422c437de5f9d49f51a67079722ad57c58717 Mon Sep 17 00:00:00 2001 From: Ken Wakasa Date: Tue, 10 Dec 2013 10:56:31 +0900 Subject: Rename deprecated locale directories cf. Ibe392f5f9dbc82c3cdff8e06b958bc3bcce3fa82 Also, cf. bug id 11340849 Change-Id: I43e84f8ca04eb1aa74037a705970a36434429a0f --- java/src/com/android/inputmethod/latin/utils/LocaleUtils.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'java/src/com/android/inputmethod/latin/utils/LocaleUtils.java') 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]); -- cgit v1.2.3-83-g751a