diff options
| author |   satok <satok@google.com> | 2011-03-25 19:24:19 -0700 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-03-25 19:24:19 -0700 |
| commit | e932a0ae78e17eba0512c81fe7388f01fd45466d (patch) | |
| tree | 7c2723ce4790a69169b10196af12c74a0da93974 /java/src/com/android/inputmethod/latin | |
| parent | 829b97b28d948cbdd38b6d9997e62a2a2eecf60b (diff) | |
| parent | 9115dd272328def247116ccf1ce458d360fec4ad (diff) | |
| download | latinime-e932a0ae78e17eba0512c81fe7388f01fd45466d.tar.gz latinime-e932a0ae78e17eba0512c81fe7388f01fd45466d.tar.xz latinime-e932a0ae78e17eba0512c81fe7388f01fd45466d.zip | |
Merge remote branch 'goog/master' into merge
Conflicts:
java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java
java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java
java/src/com/android/inputmethod/deprecated/voice/VoiceInputLogger.java
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
Change-Id: Ibcb1aa61cbab8ff1863260a579d26d065ee7bd40
Diffstat (limited to 'java/src/com/android/inputmethod/latin')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SubtypeSwitcher.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java index 6610a65ef..10a3369ac 100644 --- a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java +++ b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java @@ -210,7 +210,7 @@ public class SubtypeSwitcher { final String newLocale; final String newMode; final String oldMode = getCurrentSubtypeMode(); - if (newSubtype == null || newSubtype.getOriginalObject() == null) { + if (newSubtype == null || !newSubtype.hasOriginalObject()) { // Normally, newSubtype shouldn't be null. But just in case newSubtype was null, // fallback to the default locale. Log.w(TAG, "Couldn't get the current subtype."); |