aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-02-26 13:57:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-02-26 13:57:06 +0000
commitc6ee9e692c02b49b2feabda494985f59eff33d68 (patch)
tree62d2f192c6fe5ca5baa88e077228b638c76c24ee /java
parentf7dbd991820794939992219c932276ff3fb9bf6d (diff)
parent183fe8003163702a0ba9487d6fde2a7c025ab91a (diff)
downloadlatinime-c6ee9e692c02b49b2feabda494985f59eff33d68.tar.gz
latinime-c6ee9e692c02b49b2feabda494985f59eff33d68.tar.xz
latinime-c6ee9e692c02b49b2feabda494985f59eff33d68.zip
am 183fe800: Small cleanup of RunInLocale
* commit '183fe8003163702a0ba9487d6fde2a7c025ab91a': Small cleanup of RunInLocale
Diffstat (limited to 'java')
-rw-r--r--java/src/com/android/inputmethod/latin/LocaleUtils.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LocaleUtils.java b/java/src/com/android/inputmethod/latin/LocaleUtils.java
index fcf727041..5fde8158a 100644
--- a/java/src/com/android/inputmethod/latin/LocaleUtils.java
+++ b/java/src/com/android/inputmethod/latin/LocaleUtils.java
@@ -180,14 +180,15 @@ public final class LocaleUtils {
synchronized (sLockForRunInLocale) {
final Configuration conf = res.getConfiguration();
final Locale oldLocale = conf.locale;
+ final boolean needsChange = (newLocale != null && !newLocale.equals(oldLocale));
try {
- if (newLocale != null && !newLocale.equals(oldLocale)) {
+ if (needsChange) {
conf.locale = newLocale;
res.updateConfiguration(conf, null);
}
return job(res);
} finally {
- if (newLocale != null && !newLocale.equals(oldLocale)) {
+ if (needsChange) {
conf.locale = oldLocale;
res.updateConfiguration(conf, null);
}