aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorsatok <satok@google.com>2012-04-04 11:09:13 +0900
committersatok <satok@google.com>2012-04-04 11:09:13 +0900
commitf088204a90435d672d6203aad08b833a07148742 (patch)
tree8daff68d2508e195b3fbf16708fc55650632f753 /java/src
parentbee1a10285e861b366908b536247ad1df6d3efe9 (diff)
downloadlatinime-f088204a90435d672d6203aad08b833a07148742.tar.gz
latinime-f088204a90435d672d6203aad08b833a07148742.tar.xz
latinime-f088204a90435d672d6203aad08b833a07148742.zip
Fix NPE in SuggestedWords
Bug: 6279966 Change-Id: Ia94a78d79cc51014126d18612aabdc7ce51487a4
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/SuggestedWords.java5
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;
}