Merge "Fix NPE in SuggestedWords"

main
satok 2012-04-03 19:23:03 -07:00 committed by Android (Google) Code Review
commit d8af793983
1 changed files with 3 additions and 2 deletions

View File

@ -87,8 +87,9 @@ public class SuggestedWords {
final CompletionInfo[] infos) { final CompletionInfo[] infos) {
final ArrayList<SuggestedWordInfo> result = new ArrayList<SuggestedWordInfo>(); final ArrayList<SuggestedWordInfo> result = new ArrayList<SuggestedWordInfo>();
for (CompletionInfo info : infos) { for (CompletionInfo info : infos) {
if (null != info) result.add(new SuggestedWordInfo(info.getText(), if (null != info && info.getText() != null) {
SuggestedWordInfo.MAX_SCORE)); result.add(new SuggestedWordInfo(info.getText(), SuggestedWordInfo.MAX_SCORE));
}
} }
return result; return result;
} }