commit 183fe8003163702a0ba9487d6fde2a7c025ab91a
author Tadashi G. Takaoka <takaoka@google.com> Tue Feb 26 19:11:49 2013 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Tue Feb 26 19:11:49 2013 +0900
tree c655822337d1d7f5818fb35473aff9d1a7afa2ae
parent 0f3c05cd6bee664e5ccaf632c35c34017eb1c5e9

Small cleanup of RunInLocale

Change-Id: Ib588e67da2c88345fc4eb51587b07ebfa434e0bb

java/src/com/android/inputmethod/latin/LocaleUtils.java

diff --git a/java/src/com/android/inputmethod/latin/LocaleUtils.java b/java/src/com/android/inputmethod/latin/LocaleUtils.java
index fcf7270..5fde815 100644
--- a/java/src/com/android/inputmethod/latin/LocaleUtils.java
+++ b/java/src/com/android/inputmethod/latin/LocaleUtils.java
@@ -180,14 +180,15 @@
             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);
                     }