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

am a3ac6f24: 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 elemen 

* commit 'a3ac6f24cc6a22651e09a1bf7fc018d4af945333':
  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:25:09 +00:00 committed by Android Git Automerger
parent 85c78f7124 a3ac6f24cc
commit af096dff14
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,12 +64,15 @@ public class DictionaryFacilitatorLruCache {
} }
private void resetDictionariesForLocaleLocked() { private void resetDictionariesForLocaleLocked() {
// 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. // Note: Given that personalized dictionaries are not used here; we can pass null account.
mDictionaryFacilitator.resetDictionaries(mContext, new Locale[]{mLocale}, mDictionaryFacilitator.resetDictionaries(mContext, new Locale[]{mLocale},
mUseContactsDictionary, false /* usePersonalizedDicts */, mUseContactsDictionary, false /* usePersonalizedDicts */,
false /* forceReloadMainDictionary */, null /* account */, false /* forceReloadMainDictionary */, null /* account */,
mDictionaryNamePrefix, null /* listener */); mDictionaryNamePrefix, null /* listener */);
} }
}
public void setUseContactsDictionary(final boolean useContactsDictionary) { public void setUseContactsDictionary(final boolean useContactsDictionary) {
synchronized (mLock) { synchronized (mLock) {