diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-02-26 05:59:24 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-02-26 05:59:24 -0800 |
| commit | 0a0e04e8334872639f1f2075c5eb71f95d839069 (patch) | |
| tree | 404da6842f7ee2251f559f0e0a882ed473d72c10 /java/src | |
| parent | cb2b3567b0dfa5872b36dc5cbce2ea918aed95bc (diff) | |
| parent | c6ee9e692c02b49b2feabda494985f59eff33d68 (diff) | |
| download | latinime-0a0e04e8334872639f1f2075c5eb71f95d839069.tar.gz latinime-0a0e04e8334872639f1f2075c5eb71f95d839069.tar.xz latinime-0a0e04e8334872639f1f2075c5eb71f95d839069.zip | |
am c6ee9e69: am 183fe800: Small cleanup of RunInLocale
* commit 'c6ee9e692c02b49b2feabda494985f59eff33d68':
Small cleanup of RunInLocale
Diffstat (limited to 'java/src')
| -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); } |