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

Merge "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."

main
Mario Tanev 2015-02-25 00:20:31 +00:00 committed by Android (Google) Code Review
parent 24c282437d 1a6d01b61e
commit a3ac6f24cc
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
java/src/com/android/inputmethod/latin/DictionaryFacilitatorLruCache.java
View File

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