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

Close spell-checking dictionaries in a background thread

Browse source 
Bug: 6584677
Change-Id: Ifd9b0f995f4e0cf4d35a7ecde767826ab976f0b8
This commit is contained in:
Jean Chalard 2012-06-07 12:33:33 +09:00
parent 69b4e411e1
commit 769cecf7e7
1 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
View file

@ -372,27 +372,32 @@ public class AndroidSpellCheckerService extends SpellCheckerService
mUserDictionaries = Collections.synchronizedMap(new TreeMap<String, Dictionary>()); mUserDictionaries = Collections.synchronizedMap(new TreeMap<String, Dictionary>());
final Map<String, Dictionary> oldWhitelistDictionaries = mWhitelistDictionaries; final Map<String, Dictionary> oldWhitelistDictionaries = mWhitelistDictionaries;
mWhitelistDictionaries = Collections.synchronizedMap(new TreeMap<String, Dictionary>()); mWhitelistDictionaries = Collections.synchronizedMap(new TreeMap<String, Dictionary>());
for (DictionaryPool pool : oldPools.values()) { new Thread("spellchecker_close_dicts") {
pool.close(); @Override
} public void run() {
for (Dictionary dict : oldUserDictionaries.values()) { for (DictionaryPool pool : oldPools.values()) {
dict.close(); pool.close();
} }
for (Dictionary dict : oldWhitelistDictionaries.values()) { for (Dictionary dict : oldUserDictionaries.values()) {
dict.close(); dict.close();
} }
synchronized (mUseContactsLock) { for (Dictionary dict : oldWhitelistDictionaries.values()) {
if (null != mContactsDictionary) { dict.close();
// The synchronously loaded contacts dictionary should have been in one }
// or several pools, but it is shielded against multiple closing and it's synchronized (mUseContactsLock) {
// safe to call it several times. if (null != mContactsDictionary) {
final Dictionary dictToClose = mContactsDictionary; // The synchronously loaded contacts dictionary should have been in one
// TODO: revert to the concrete type when USE_BINARY_CONTACTS_DICTIONARY is no // or several pools, but it is shielded against multiple closing and it's
// longer needed // safe to call it several times.
mContactsDictionary = null; final Dictionary dictToClose = mContactsDictionary;
dictToClose.close(); // TODO: revert to the concrete type when USE_BINARY_CONTACTS_DICTIONARY
// is no longer needed
mContactsDictionary = null;
dictToClose.close();
}
}
} }
} }.start();
} }
private DictionaryPool getDictionaryPool(final String locale) { private DictionaryPool getDictionaryPool(final String locale) {