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

am a024ac6b: Merge "Fix an NPE"

Browse source 
* commit 'a024ac6b206316a96d472d4e2dd3ef1a22e05eac':
  Fix an NPE
This commit is contained in:
Jean Chalard 2013-04-15 20:45:31 -07:00 committed by Android Git Automerger
commit 10800d4bce
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(