From 3d407cc086145db6b05af25a0610ef9ba2d263ec Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Thu, 26 Apr 2012 13:41:15 +0900
Subject: [PATCH] Fix SubtypeSwitcher incomplete initialization
Bug: 6400718
Change-Id: Id5dce156ad397b911bfeaedeeddd4aeb21a10b3a
---
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
index 8042873091..f2d971ca46 100644
--- a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
@@ -182,12 +182,13 @@ public class SubtypeSwitcher {
+ newSubtype.getLocale() + "/" + newSubtype.getExtraValue() + ", from: "
+ mCurrentSubtype.getLocale() + "/" + mCurrentSubtype.getExtraValue());
}
- if (newSubtype.equals(mCurrentSubtype)) return;
final Locale newLocale = SubtypeLocale.getSubtypeLocale(newSubtype);
mNeedsToDisplayLanguage.updateIsSystemLanguageSameAsInputLanguage(
mCurrentSystemLocale.equals(newLocale));
+ if (newSubtype.equals(mCurrentSubtype)) return;
+
mCurrentSubtype = newSubtype;
updateShortcutIME();
mService.onRefreshKeyboard();
--
GitLab