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

am ac37d4d9: Merge "Move dict version check to proper place."

Browse source 
* commit 'ac37d4d9e381c8fa5262e529594d6b898a8a2e5f':
  Move dict version check to proper place.
This commit is contained in:
Keisuke Kuroyanagi 2014-05-01 09:21:57 +00:00 committed by Android Git Automerger
commit f134aa78b7
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);
} }