Fix an NPE

Bug: 8620758
Change-Id: I39f07939ebb6148a48aae5b915ee807002a5b02d
This commit is contained in:
Jean Chalard 2013-04-16 12:17:22 +09:00
parent 033958330d
commit 7be3ca2ccf

View file

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