aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/ImfUtils.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-07-19 22:57:38 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-19 22:57:39 -0700
commit732edc1ff18689ff69fd9d0a89a7dd401998884b (patch)
tree1dbfe767b173c8095b6f2dcbab33e9f1f8a45234 /java/src/com/android/inputmethod/latin/ImfUtils.java
parent48ded4e3b1205628fc82874d92ac7ab1f1f7f79f (diff)
parentd6a18cdedb74a76e00c50af48eb7d5743358823f (diff)
downloadlatinime-732edc1ff18689ff69fd9d0a89a7dd401998884b.tar.gz
latinime-732edc1ff18689ff69fd9d0a89a7dd401998884b.tar.xz
latinime-732edc1ff18689ff69fd9d0a89a7dd401998884b.zip
Merge "Fix NPE where the current subtype is null"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/ImfUtils.java')
-rw-r--r--java/src/com/android/inputmethod/latin/ImfUtils.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/ImfUtils.java b/java/src/com/android/inputmethod/latin/ImfUtils.java
index b882a4860..1461c0240 100644
--- a/java/src/com/android/inputmethod/latin/ImfUtils.java
+++ b/java/src/com/android/inputmethod/latin/ImfUtils.java
@@ -90,6 +90,13 @@ public class ImfUtils {
return false;
}
+ public static InputMethodSubtype getCurrentInputMethodSubtype(Context context,
+ InputMethodSubtype defaultSubtype) {
+ final InputMethodManager imm = getInputMethodManager(context);
+ final InputMethodSubtype currentSubtype = imm.getCurrentInputMethodSubtype();
+ return (currentSubtype != null) ? currentSubtype : defaultSubtype;
+ }
+
public static boolean hasMultipleEnabledIMEsOrSubtypes(Context context,
final boolean shouldIncludeAuxiliarySubtypes) {
final InputMethodManager imm = getInputMethodManager(context);