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

Merge "Move dict version check to proper place."

main
Keisuke Kuroyanagi 2014-05-01 09:18:58 +00:00 committed by Android (Google) Code Review
parent d6d2a41be9 c3b151957c
commit ac37d4d9e3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
View File

@ -528,8 +528,6 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
} else if (mBinaryDictionary == null) { } else if (mBinaryDictionary == null) {
// Otherwise, load the existing dictionary. // Otherwise, load the existing dictionary.
loadBinaryDictionaryLocked(); loadBinaryDictionaryLocked();
}
mNeedsToReload = false;
if (mBinaryDictionary != null && !(isValidDictionaryLocked() if (mBinaryDictionary != null && !(isValidDictionaryLocked()
// TODO: remove the check below // TODO: remove the check below
&& matchesExpectedBinaryDictFormatVersionForThisType( && matchesExpectedBinaryDictFormatVersionForThisType(
@ -539,6 +537,8 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
// existing files if appropriate. // existing files if appropriate.
createNewDictionaryLocked(); createNewDictionaryLocked();
} }
}
mNeedsToReload = false;
} finally { } finally {
mIsReloading.set(false); mIsReloading.set(false);
} }