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

am 4c45fff2: Merge "Fix: NPE when initializing AOSP keyboard." 

* commit '4c45fff2404b274cf6345221412671a81f0dba46':
  Fix: NPE when initializing AOSP keyboard.
main
Keisuke Kuroyanagi 2014-06-17 02:50:52 +00:00 committed by Android Git Automerger
parent 7b877870fd 4c45fff240
commit fc5768e786
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionaryUpdater.java
View File

@ -23,11 +23,14 @@ import android.content.Context;
import com.android.inputmethod.latin.DictionaryFacilitator;
public class PersonalizationDictionaryUpdater {
final Context mContext;
final DictionaryFacilitator mDictionaryFacilitator;
boolean mDictCleared = false;
public PersonalizationDictionaryUpdater(final Context context,
final DictionaryFacilitator dictionaryFacilitator) {
// Clear and never update the personalization dictionary.
PersonalizationHelper.removeAllPersonalizationDictionaries(context);
dictionaryFacilitator.clearPersonalizationDictionary();
mContext = context;
mDictionaryFacilitator = dictionaryFacilitator;
}
public Locale getLocale() {
@ -36,6 +39,12 @@ public class PersonalizationDictionaryUpdater {
public void onLoadSettings(final boolean usePersonalizedDicts,
final boolean isSystemLocaleSameAsLocaleOfAllEnabledSubtypesOfEnabledImes) {
if (!mDictCleared) {
// Clear and never update the personalization dictionary.
PersonalizationHelper.removeAllPersonalizationDictionaries(mContext);
mDictionaryFacilitator.clearPersonalizationDictionary();
mDictCleared = true;
}
}
public void onDestroy() {