diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-04-15 20:45:31 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-04-15 20:45:31 -0700 |
| commit | 10800d4bce94b5735b94b056c60f9e61a7d57471 (patch) | |
| tree | 8cd75d42e0d4f366fbb4ece908a34df07137c5d2 /java/src | |
| parent | 7cb72808551d5543ffce16d7287c029ec689af16 (diff) | |
| parent | a024ac6b206316a96d472d4e2dd3ef1a22e05eac (diff) | |
| download | latinime-10800d4bce94b5735b94b056c60f9e61a7d57471.tar.gz latinime-10800d4bce94b5735b94b056c60f9e61a7d57471.tar.xz latinime-10800d4bce94b5735b94b056c60f9e61a7d57471.zip | |
am a024ac6b: Merge "Fix an NPE"
* commit 'a024ac6b206316a96d472d4e2dd3ef1a22e05eac':
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( |