commit a024ac6b206316a96d472d4e2dd3ef1a22e05eac
author Jean Chalard <jchalard@google.com> Tue Apr 16 03:43:06 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 16 03:43:06 2013 +0000
tree 8cd75d42e0d4f366fbb4ece908a34df07137c5d2
parent 785c5068e4f625712b21b8087f15db55784768cb
parent 7be3ca2ccfe05f6659dbbac84de9ff1be4d92e3d

Merge "Fix an NPE"

java/src/com/android/inputmethod/latin/LatinIME.java

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index bf4c22d..c7f647f 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -995,8 +995,6 @@
             }
         }
         if (!mSettings.getCurrent().isApplicationSpecifiedCompletionsOn()) return;
-        mApplicationSpecifiedCompletions =
-                CompletionInfoUtils.removeNulls(applicationSpecifiedCompletions);
         if (applicationSpecifiedCompletions == null) {
             clearSuggestionStrip();
             if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
@@ -1004,6 +1002,8 @@
             }
             return;
         }
+        mApplicationSpecifiedCompletions =
+                CompletionInfoUtils.removeNulls(applicationSpecifiedCompletions);
 
         final ArrayList<SuggestedWords.SuggestedWordInfo> applicationSuggestedWords =
                 SuggestedWords.getFromApplicationSpecifiedCompletions(