diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-08-25 09:26:16 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-08-25 09:26:17 +0000 |
| commit | ee8ebeecbf80b9cccc5569570112634b49c45b53 (patch) | |
| tree | 35bd630542bc0281ed556afc1558c334b6ffd4af /java/src/com/android/inputmethod/latin | |
| parent | e5e7a91b490eb1214ee19031cada5f9754b45933 (diff) | |
| parent | dc110b2a6a1c8b318bfb1f652d823abcb89dec0a (diff) | |
| download | latinime-ee8ebeecbf80b9cccc5569570112634b49c45b53.tar.gz latinime-ee8ebeecbf80b9cccc5569570112634b49c45b53.tar.xz latinime-ee8ebeecbf80b9cccc5569570112634b49c45b53.zip | |
Merge "Fix unit tests"
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; |