diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-10-01 10:21:13 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 10:21:13 +0000 |
| commit | 4108bc2efedb3c895f0f6f3ee45b39dba5644e42 (patch) | |
| tree | 7373692b44c651245ef0c0923825f88cf85e5a88 /java | |
| parent | cc13f8864dd8487dfdf8a50cbfcb13b098b0c608 (diff) | |
| parent | 7f226b4f9db15105b10fdc04249db433772e87b4 (diff) | |
| download | latinime-4108bc2efedb3c895f0f6f3ee45b39dba5644e42.tar.gz latinime-4108bc2efedb3c895f0f6f3ee45b39dba5644e42.tar.xz latinime-4108bc2efedb3c895f0f6f3ee45b39dba5644e42.zip | |
am 7f226b4f: Merge "Fix an NPE on ICS factory rom."
* commit '7f226b4f9db15105b10fdc04249db433772e87b4':
Fix an NPE on ICS factory rom.
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java index d7e1eba8b..48c8afa2a 100644 --- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java +++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java @@ -1649,8 +1649,10 @@ public final class InputLogic { } } // Add the suggestion list to the list of suggestions. - textToCommit.setSpan(new SuggestionSpan(inputTransaction.mSettingsValues.mLocale, - suggestions.toArray(new String[suggestions.size()]), 0 /* flags */), + textToCommit.setSpan(new SuggestionSpan(mLatinIME /* context */, + inputTransaction.mSettingsValues.mLocale, + suggestions.toArray(new String[suggestions.size()]), 0 /* flags */, + null /* notificationTargetClass */), 0 /* start */, lastCharIndex /* end */, 0 /* flags */); } |