aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin
diff options
context:
space:
mode:
authorsatok <satok@google.com>2011-03-25 15:56:10 -0700
committersatok <satok@google.com>2011-03-25 18:38:20 -0700
commit9115dd272328def247116ccf1ce458d360fec4ad (patch)
tree1c8d717c55556a3b643d612f6e06e6be4dd2fca5 /java/src/com/android/inputmethod/latin
parentf1a81f5eb37df4170de2cf6327c860e3d64dc2f8 (diff)
downloadlatinime-9115dd272328def247116ccf1ce458d360fec4ad.tar.gz
latinime-9115dd272328def247116ccf1ce458d360fec4ad.tar.xz
latinime-9115dd272328def247116ccf1ce458d360fec4ad.zip
Fix some compat bugs and add VoiceInputLoggerCompatUtils
Change-Id: I54ed0853ed4423704a300977d7880678e066a6fb
Diffstat (limited to 'java/src/com/android/inputmethod/latin')
-rw-r--r--java/src/com/android/inputmethod/latin/SubtypeSwitcher.java2
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 bac84888d..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) {
+ 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.");