Fix: NPE when initializing AOSP keyboard.
Bug: 15677822 Change-Id: Ibebb215a08795482c0f1eef965db06af57558906
This commit is contained in:
parent
37c49f63df
commit
34ed5b0742
1 changed files with 12 additions and 3 deletions
|
@ -23,11 +23,14 @@ import android.content.Context;
|
||||||
import com.android.inputmethod.latin.DictionaryFacilitator;
|
import com.android.inputmethod.latin.DictionaryFacilitator;
|
||||||
|
|
||||||
public class PersonalizationDictionaryUpdater {
|
public class PersonalizationDictionaryUpdater {
|
||||||
|
final Context mContext;
|
||||||
|
final DictionaryFacilitator mDictionaryFacilitator;
|
||||||
|
boolean mDictCleared = false;
|
||||||
|
|
||||||
public PersonalizationDictionaryUpdater(final Context context,
|
public PersonalizationDictionaryUpdater(final Context context,
|
||||||
final DictionaryFacilitator dictionaryFacilitator) {
|
final DictionaryFacilitator dictionaryFacilitator) {
|
||||||
// Clear and never update the personalization dictionary.
|
mContext = context;
|
||||||
PersonalizationHelper.removeAllPersonalizationDictionaries(context);
|
mDictionaryFacilitator = dictionaryFacilitator;
|
||||||
dictionaryFacilitator.clearPersonalizationDictionary();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Locale getLocale() {
|
public Locale getLocale() {
|
||||||
|
@ -36,6 +39,12 @@ public class PersonalizationDictionaryUpdater {
|
||||||
|
|
||||||
public void onLoadSettings(final boolean usePersonalizedDicts,
|
public void onLoadSettings(final boolean usePersonalizedDicts,
|
||||||
final boolean isSystemLocaleSameAsLocaleOfAllEnabledSubtypesOfEnabledImes) {
|
final boolean isSystemLocaleSameAsLocaleOfAllEnabledSubtypesOfEnabledImes) {
|
||||||
|
if (!mDictCleared) {
|
||||||
|
// Clear and never update the personalization dictionary.
|
||||||
|
PersonalizationHelper.removeAllPersonalizationDictionaries(mContext);
|
||||||
|
mDictionaryFacilitator.clearPersonalizationDictionary();
|
||||||
|
mDictCleared = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onDestroy() {
|
public void onDestroy() {
|
||||||
|
|
Loading…
Reference in a new issue