diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-05-22 13:07:36 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-05-22 13:07:36 +0000 |
| commit | 9069977fb1bad2bf335fe803f5cb17fcccbf69b7 (patch) | |
| tree | e59a8c69689b5a4189826494470a0ffe2f577fff /java/src/com/android | |
| parent | 259fd7ed3b71e3003c2baff807b2f6507da3e292 (diff) | |
| parent | a2ce9a49acbc0842b5a714e8ecbd34be1a786477 (diff) | |
| download | latinime-9069977fb1bad2bf335fe803f5cb17fcccbf69b7.tar.gz latinime-9069977fb1bad2bf335fe803f5cb17fcccbf69b7.tar.xz latinime-9069977fb1bad2bf335fe803f5cb17fcccbf69b7.zip | |
am a2ce9a49: Fix NPE happening in unit tests.
* commit 'a2ce9a49acbc0842b5a714e8ecbd34be1a786477':
Fix NPE happening in unit tests.
Diffstat (limited to 'java/src/com/android')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index ab7e66a09..217b0b162 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1747,9 +1747,10 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen @UsedForTesting /* package for test */ DistracterFilter createDistracterFilter() { - return new DistracterFilter(this /* Context */, + // Return an empty distracter filter when this method is called before onCreate(). + return (mRichImm != null) ? new DistracterFilter(this /* Context */, mRichImm.getMyEnabledInputMethodSubtypeList( - true /* allowsImplicitlySelectedSubtypes */)); + true /* allowsImplicitlySelectedSubtypes */)) : new DistracterFilter(); } public void dumpDictionaryForDebug(final String dictName) { |