nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 9f02a67c: Merge "Fix: NPE after turning on personalized suggestion." 

* commit '9f02a67c77a1fdfb011bd93d6caf2f455ba358f6':
  Fix: NPE after turning on personalized suggestion.
main
Keisuke Kuroyanagi 2014-06-09 05:39:08 +00:00 committed by Android Git Automerger
parent 53290f5de6 9f02a67c77
commit f7cf57ed3d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
View File

@ -574,6 +574,12 @@ public class DictionaryFacilitator {
final ExpandableBinaryDictionary.AddMultipleDictionaryEntriesCallback callback) {
final ExpandableBinaryDictionary personalizationDict =
mDictionaries.getSubDict(Dictionary.TYPE_PERSONALIZATION);
if (personalizationDict == null) {
if (callback != null) {
callback.onFinished();
}
return;
}
final ArrayList<LanguageModelParam> languageModelParams =
LanguageModelParam.createLanguageModelParamsFrom(
personalizationDataChunk.mTokens,
@ -581,8 +587,7 @@ public class DictionaryFacilitator {
this /* dictionaryFacilitator */, spacingAndPunctuations,
new DistracterFilterCheckingIsInDictionary(
mDistracterFilter, personalizationDict));
if (personalizationDict == null || languageModelParams == null
|| languageModelParams.isEmpty()) {
if (languageModelParams == null || languageModelParams.isEmpty()) {
if (callback != null) {
callback.onFinished();
}