2 files changed, 10 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 3ec1fe257..d96b858eb 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -72,6 +72,7 @@ import com.android.inputmethod.latin.suggestions.SuggestionsView;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
+import java.util.List;
 import java.util.Locale;
 
 /**
@@ -979,8 +980,11 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
                 return;
             }
 
+            final List<CharSequence> applicationSuggestedWords =
+                    SuggestedWords.Builder.getFromApplicationSpecifiedCompletions(
+                            applicationSpecifiedCompletions);
             SuggestedWords.Builder builder = new SuggestedWords.Builder()
-                    .setApplicationSpecifiedCompletions(applicationSpecifiedCompletions)
+                    .addWords(applicationSuggestedWords, null)
                     .setTypedWordValid(false)
                     .setHasMinimalSuggestion(false);
             // When in fullscreen mode, show completions generated by the application
diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java
index 78142b6b3..8bfe7694b 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -132,11 +132,13 @@ public class SuggestedWords {
             return this;
         }
 
-        public Builder setApplicationSpecifiedCompletions(CompletionInfo[] infos) {
+        public static List<CharSequence> getFromApplicationSpecifiedCompletions(
+                final CompletionInfo[] infos) {
+            final ArrayList<CharSequence> result = new ArrayList<CharSequence>();
             for (CompletionInfo info : infos) {
-                if (null != info) addWord(info.getText());
+                if (null != info) result.add(info.getText());
             }
-            return this;
+            return result;
         }
 
         public Builder setTypedWordValid(boolean typedWordValid) {