diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-04-17 19:47:25 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-04-17 19:47:25 -0700 |
| commit | 5557bf5ba7e33a300f35f751b7cd1916ff8e7b6c (patch) | |
| tree | 7b99def085151821eeae61fc1be037dbf10fb355 | |
| parent | 895fca8f42796e6b39dc710cc02af62b8e757adc (diff) | |
| parent | 10800d4bce94b5735b94b056c60f9e61a7d57471 (diff) | |
| download | latinime-5557bf5ba7e33a300f35f751b7cd1916ff8e7b6c.tar.gz latinime-5557bf5ba7e33a300f35f751b7cd1916ff8e7b6c.tar.xz latinime-5557bf5ba7e33a300f35f751b7cd1916ff8e7b6c.zip | |
am 10800d4b: am a024ac6b: Merge "Fix an NPE"
* commit '10800d4bce94b5735b94b056c60f9e61a7d57471':
Fix an NPE
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index bf4c22d23..c7f647f2a 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -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( |