nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

* commit '10800d4bce94b5735b94b056c60f9e61a7d57471':
  Fix an NPE
main
Jean Chalard 2013-04-17 19:47:25 -07:00 committed by Android Git Automerger
parent 895fca8f42 10800d4bce
commit 5557bf5ba7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/com/android/inputmethod/latin/LatinIME.java
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(