Don't call resetDictionaries if DictionaryFacilitatorLruCache.get()

hasn't been called yet. This breaks the AOSP SpellChecker.  This seems
to be a bug introduced recently, when the
DictionaryFacilitatorLruCache was turned into a "cache" of 1 element.

Change-Id: I55f6c18b274c9a33fd62cb25bcd02f64788d5ff0
This commit is contained in:
Mario Tanev 2015-02-24 15:56:43 -08:00
parent f7058c2a89
commit 1a6d01b61e

View file

@ -64,11 +64,14 @@ public class DictionaryFacilitatorLruCache {
}
private void resetDictionariesForLocaleLocked() {
// Note: Given that personalized dictionaries are not used here; we can pass null account.
mDictionaryFacilitator.resetDictionaries(mContext, new Locale[]{mLocale},
mUseContactsDictionary, false /* usePersonalizedDicts */,
false /* forceReloadMainDictionary */, null /* account */,
mDictionaryNamePrefix, null /* listener */);
// Nothing to do if the locale is null. This would be the case before any get() calls.
if (mLocale != null) {
// Note: Given that personalized dictionaries are not used here; we can pass null account.
mDictionaryFacilitator.resetDictionaries(mContext, new Locale[]{mLocale},
mUseContactsDictionary, false /* usePersonalizedDicts */,
false /* forceReloadMainDictionary */, null /* account */,
mDictionaryNamePrefix, null /* listener */);
}
}
public void setUseContactsDictionary(final boolean useContactsDictionary) {