diff options
| author |   satok <satok@google.com> | 2012-04-03 19:23:03 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-04-03 19:23:03 -0700 |
| commit | d8af79398378ced8827b27481f3fb59b32b6c3b9 (patch) | |
| tree | 5787008a322ae52a7714ca2fc4a51aee409aba35 /java/src | |
| parent | 04df2bca22d7ffcc1947bc26dd88ddcb44fd13ad (diff) | |
| parent | f088204a90435d672d6203aad08b833a07148742 (diff) | |
| download | latinime-d8af79398378ced8827b27481f3fb59b32b6c3b9.tar.gz latinime-d8af79398378ced8827b27481f3fb59b32b6c3b9.tar.xz latinime-d8af79398378ced8827b27481f3fb59b32b6c3b9.zip | |
Merge "Fix NPE in SuggestedWords"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SuggestedWords.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java index 0c0ce182f..91110d888 100644 --- a/java/src/com/android/inputmethod/latin/SuggestedWords.java +++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java @@ -87,8 +87,9 @@ public class SuggestedWords { final CompletionInfo[] infos) { final ArrayList<SuggestedWordInfo> result = new ArrayList<SuggestedWordInfo>(); for (CompletionInfo info : infos) { - if (null != info) result.add(new SuggestedWordInfo(info.getText(), - SuggestedWordInfo.MAX_SCORE)); + if (null != info && info.getText() != null) { + result.add(new SuggestedWordInfo(info.getText(), SuggestedWordInfo.MAX_SCORE)); + } } return result; } |