am 10800d4b: am a024ac6b: Merge "Fix an NPE"

* commit '10800d4bce94b5735b94b056c60f9e61a7d57471':
  Fix an NPE
This commit is contained in:
Jean Chalard 2013-04-17 19:47:25 -07:00 committed by Android Git Automerger
commit 5557bf5ba7

View File

@ -995,8 +995,6 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
}
}
if (!mSettings.getCurrent().isApplicationSpecifiedCompletionsOn()) return;
mApplicationSpecifiedCompletions =
CompletionInfoUtils.removeNulls(applicationSpecifiedCompletions);
if (applicationSpecifiedCompletions == null) {
clearSuggestionStrip();
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
@ -1004,6 +1002,8 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
}
return;
}
mApplicationSpecifiedCompletions =
CompletionInfoUtils.removeNulls(applicationSpecifiedCompletions);
final ArrayList<SuggestedWords.SuggestedWordInfo> applicationSuggestedWords =
SuggestedWords.getFromApplicationSpecifiedCompletions(