diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-05-22 21:57:07 +0900 |
|---|---|---|
| committer | Keisuke Kuroyanagi <ksk@google.com> | 2014-05-22 21:57:07 +0900 |
| commit | a2ce9a49acbc0842b5a714e8ecbd34be1a786477 (patch) | |
| tree | e59a8c69689b5a4189826494470a0ffe2f577fff /java | |
| parent | dc1e70b379415531aa4344bceca299f9ca662444 (diff) | |
| download | latinime-a2ce9a49acbc0842b5a714e8ecbd34be1a786477.tar.gz latinime-a2ce9a49acbc0842b5a714e8ecbd34be1a786477.tar.xz latinime-a2ce9a49acbc0842b5a714e8ecbd34be1a786477.zip | |
Fix NPE happening in unit tests.
Change-Id: I2fc0dba53e18883755ff77351c152a9d3534c92b
Diffstat (limited to 'java')
| -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) { |