Merge "Move dict version check to proper place."

This commit is contained in:
Keisuke Kuroyanagi 2014-05-01 09:18:58 +00:00 committed by Android (Google) Code Review
commit ac37d4d9e3

View file

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