From f088204a90435d672d6203aad08b833a07148742 Mon Sep 17 00:00:00 2001
From: satok <satok@google.com>
Date: Wed, 4 Apr 2012 11:09:13 +0900
Subject: [PATCH] Fix NPE in SuggestedWords

Bug: 6279966
Change-Id: Ia94a78d79cc51014126d18612aabdc7ce51487a4
---
 java/src/com/android/inputmethod/latin/SuggestedWords.java | 5 +++--
 1 file 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;
     }