nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a NPE when sent buggy data by an application 

Bug: 5072247
Change-Id: I7369877072f6bb94dff5b1bcf52c9f8dde4854b7
main
Jean Chalard 2011-07-26 19:24:58 +09:00
parent 9a388f2ef3
commit e576a0d537
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
java/src/com/android/inputmethod/latin/SuggestedWords.java
View File

@ -16,6 +16,7 @@
package com.android.inputmethod.latin;
import android.text.TextUtils;
import android.view.inputmethod.CompletionInfo;
import java.util.ArrayList;
@ -105,14 +106,18 @@ public class SuggestedWords {
}
private Builder addWord(CharSequence word, SuggestedWordInfo suggestedWordInfo) {
mWords.add(word);
mSuggestedWordInfoList.add(suggestedWordInfo);
if (!TextUtils.isEmpty(word)) {
mWords.add(word);
// It's okay if suggestedWordInfo is null since it's checked where it's used.
mSuggestedWordInfoList.add(suggestedWordInfo);
}
return this;
}
public Builder setApplicationSpecifiedCompletions(CompletionInfo[] infos) {
for (CompletionInfo info : infos)
addWord(info.getText());
for (CompletionInfo info : infos) {
if (null != info) addWord(info.getText());
}
return this;
}