nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix race condition while changing the system locale"

Browse source
This commit is contained in:
Tadashi G. Takaoka 2012-03-29 00:10:35 -07:00 committed by Android (Google) Code Review
commit aaa9e8626a
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
java/src/com/android/inputmethod/latin/LocaleUtils.java
View file

@ -168,12 +168,14 @@ public class LocaleUtils {
* @param newLocale the locale to change to. * @param newLocale the locale to change to.
* @return the old locale. * @return the old locale.
*/ */
public static Locale setSystemLocale(final Resources res, final Locale newLocale) { public static synchronized Locale setSystemLocale(final Resources res, final Locale newLocale) {
final Configuration conf = res.getConfiguration(); final Configuration conf = res.getConfiguration();
final Locale saveLocale = conf.locale; final Locale oldLocale = conf.locale;
conf.locale = newLocale; if (newLocale != null && !newLocale.equals(oldLocale)) {
res.updateConfiguration(conf, res.getDisplayMetrics()); conf.locale = newLocale;
return saveLocale; res.updateConfiguration(conf, res.getDisplayMetrics());
}
return oldLocale;
} }
private static final HashMap<String, Locale> sLocaleCache = new HashMap<String, Locale>(); private static final HashMap<String, Locale> sLocaleCache = new HashMap<String, Locale>();