aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/LatinIME.java
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2013-08-28 19:24:28 +0900
committerKeisuke Kuroyanagi <ksk@google.com>2013-08-28 19:24:28 +0900
commitfe87f5f41744a633a2ed91af9b171bda2637649e (patch)
treec18fa410e84bfebf3e540fdf6b2aeb26b5a82556 /java/src/com/android/inputmethod/latin/LatinIME.java
parent8e3a90e58ffd09692a23b29dc949a2f0fb3d774c (diff)
downloadlatinime-fe87f5f41744a633a2ed91af9b171bda2637649e.tar.gz
latinime-fe87f5f41744a633a2ed91af9b171bda2637649e.tar.xz
latinime-fe87f5f41744a633a2ed91af9b171bda2637649e.zip
Pass additionalFeaturesOptions for getSuggestions().
This fixes null pointer exceptions that are caused when getSuggestion() is called from spell checker. Change-Id: Ifc9e7abb900e1a4646e33c91022effde439673e4
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 85001c30c..de4baf948 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -2323,6 +2323,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// whatever is *before* the half-committed word in the buffer, hence 2; if we aren't, we
// should just skip whitespace if any, so 1.
final SettingsValues currentSettings = mSettings.getCurrent();
+ final int[] additionalFeaturesOptions = currentSettings.mAdditionalFeaturesSettingValues;
final String prevWord;
if (currentSettings.mCurrentLanguageHasSpaces) {
// If we are typing in a language with spaces we can just look up the previous
@@ -2335,7 +2336,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
}
return suggest.getSuggestedWords(mWordComposer, prevWord, keyboard.getProximityInfo(),
currentSettings.mBlockPotentiallyOffensive,
- currentSettings.mCorrectionEnabled, sessionId);
+ currentSettings.mCorrectionEnabled, additionalFeaturesOptions, sessionId);
}
private SuggestedWords getSuggestedWordsOrOlderSuggestions(final int sessionId) {