diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-04-16 03:43:06 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-04-16 03:43:06 +0000 |
| commit | a024ac6b206316a96d472d4e2dd3ef1a22e05eac (patch) | |
| tree | 8cd75d42e0d4f366fbb4ece908a34df07137c5d2 /java/src | |
| parent | 785c5068e4f625712b21b8087f15db55784768cb (diff) | |
| parent | 7be3ca2ccfe05f6659dbbac84de9ff1be4d92e3d (diff) | |
| download | latinime-a024ac6b206316a96d472d4e2dd3ef1a22e05eac.tar.gz latinime-a024ac6b206316a96d472d4e2dd3ef1a22e05eac.tar.xz latinime-a024ac6b206316a96d472d4e2dd3ef1a22e05eac.zip | |
Merge "Fix an NPE"
Diffstat (limited to 'java/src')
| -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( |