diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-08-25 17:15:55 +0900 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2014-08-25 18:19:00 +0900 |
| commit | dc110b2a6a1c8b318bfb1f652d823abcb89dec0a (patch) | |
| tree | ad1d18e61981b07044c8a0c216495d983bd93fb8 /java/src/com/android/inputmethod/latin | |
| parent | e38f79182d61c2b965cc3b47065c17107865df46 (diff) | |
| download | latinime-dc110b2a6a1c8b318bfb1f652d823abcb89dec0a.tar.gz latinime-dc110b2a6a1c8b318bfb1f652d823abcb89dec0a.tar.xz latinime-dc110b2a6a1c8b318bfb1f652d823abcb89dec0a.zip | |
Fix unit tests
Change-Id: I48bfa4e4dd80f36d2fe0a1e9d2a2706533cc722e
Diffstat (limited to 'java/src/com/android/inputmethod/latin')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SubtypeSwitcher.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java index c39c2542c..45d67ff88 100644 --- a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java +++ b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java @@ -315,9 +315,12 @@ public final class SubtypeSwitcher { public RichInputMethodSubtype getEmojiSubtype() { if (mEmojiSubtype == null) { - mEmojiSubtype = new RichInputMethodSubtype( + final InputMethodSubtype rawEmojiSubtype = mRichImm.findSubtypeByLocaleAndKeyboardLayoutSet( - SubtypeLocaleUtils.NO_LANGUAGE, SubtypeLocaleUtils.EMOJI)); + SubtypeLocaleUtils.NO_LANGUAGE, SubtypeLocaleUtils.EMOJI); + if (null != rawEmojiSubtype) { + mEmojiSubtype = new RichInputMethodSubtype(rawEmojiSubtype); + } } if (mEmojiSubtype != null) { return mEmojiSubtype; |