diff options
| author | Tadashi G. Takaoka <takaoka@google.com> | 2013-02-26 13:57:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-26 13:57:06 +0000 |
| commit | c6ee9e692c02b49b2feabda494985f59eff33d68 (patch) | |
| tree | 62d2f192c6fe5ca5baa88e077228b638c76c24ee /java/src/com/android/inputmethod | |
| parent | f7dbd991820794939992219c932276ff3fb9bf6d (diff) | |
| parent | 183fe8003163702a0ba9487d6fde2a7c025ab91a (diff) | |
am 183fe800: Small cleanup of RunInLocale
* commit '183fe8003163702a0ba9487d6fde2a7c025ab91a':
Small cleanup of RunInLocale
Diffstat (limited to 'java/src/com/android/inputmethod')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LocaleUtils.java | 5 |
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); } |