diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-06-09 07:55:27 +0900 |
|---|---|---|
| committer | Keisuke Kuroyanagi <ksk@google.com> | 2014-06-09 11:43:45 +0900 |
| commit | bdf745da32ddd4b2d0e395c7ae9eb346fffcfe91 (patch) | |
| tree | 62f879a6852a007f049607236e30df8acd3d891f /java/src/com/android/inputmethod/latin/DictionaryFacilitator.java | |
| parent | 1910392eeddf2c9f4c1d34925e64f8d8772e7dc4 (diff) | |
| download | latinime-bdf745da32ddd4b2d0e395c7ae9eb346fffcfe91.tar.gz latinime-bdf745da32ddd4b2d0e395c7ae9eb346fffcfe91.tar.xz latinime-bdf745da32ddd4b2d0e395c7ae9eb346fffcfe91.zip | |
Check isInDictionary() before the distracter test.
Bug: 13142176
Bug: 15428247
Change-Id: I7ce2c09ebbef6ca8c056807c2a35f2f987fd436e
Diffstat (limited to 'java/src/com/android/inputmethod/latin/DictionaryFacilitator.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/DictionaryFacilitator.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java index e8b0be069..48b6a4622 100644 --- a/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java +++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java @@ -30,6 +30,7 @@ import com.android.inputmethod.latin.personalization.PersonalizationDictionary; import com.android.inputmethod.latin.personalization.UserHistoryDictionary; import com.android.inputmethod.latin.settings.SpacingAndPunctuations; import com.android.inputmethod.latin.utils.DistracterFilter; +import com.android.inputmethod.latin.utils.DistracterFilterCheckingIsInDictionary; import com.android.inputmethod.latin.utils.ExecutorUtils; import com.android.inputmethod.latin.utils.LanguageModelParam; import com.android.inputmethod.latin.utils.SuggestionResults; @@ -571,14 +572,15 @@ public class DictionaryFacilitator { final PersonalizationDataChunk personalizationDataChunk, final SpacingAndPunctuations spacingAndPunctuations, final ExpandableBinaryDictionary.AddMultipleDictionaryEntriesCallback callback) { + final ExpandableBinaryDictionary personalizationDict = + mDictionaries.getSubDict(Dictionary.TYPE_PERSONALIZATION); final ArrayList<LanguageModelParam> languageModelParams = LanguageModelParam.createLanguageModelParamsFrom( personalizationDataChunk.mTokens, personalizationDataChunk.mTimestampInSeconds, this /* dictionaryFacilitator */, spacingAndPunctuations, - mDistracterFilter); - final ExpandableBinaryDictionary personalizationDict = - mDictionaries.getSubDict(Dictionary.TYPE_PERSONALIZATION); + new DistracterFilterCheckingIsInDictionary( + mDistracterFilter, personalizationDict)); if (personalizationDict == null || languageModelParams == null || languageModelParams.isEmpty()) { if (callback != null) { |