am d1501ea7: Make contacts/user dictionary ver2.

* commit 'd1501ea78922289beb4d108fb9624f120e8b4cdb':
  Make contacts/user dictionary ver2.
main
Keisuke Kuroyanagi 2013-12-02 05:14:09 -08:00 committed by Android Git Automerger
commit ce45d87132
2 changed files with 4 additions and 3 deletions

View File

@ -37,9 +37,9 @@ import java.util.Map;
* An in memory dictionary for memorizing entries and writing a binary dictionary.
*/
public class DictionaryWriter extends AbstractDictionaryWriter {
private static final int BINARY_DICT_VERSION = 3;
private static final int BINARY_DICT_VERSION = 2;
private static final FormatSpec.FormatOptions FORMAT_OPTIONS =
new FormatSpec.FormatOptions(BINARY_DICT_VERSION, true /* supportsDynamicUpdate */);
new FormatSpec.FormatOptions(BINARY_DICT_VERSION, false /* supportsDynamicUpdate */);
private FusionDictionary mFusionDictionary;

View File

@ -131,7 +131,8 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
protected abstract boolean hasContentChanged();
protected boolean isValidBinaryDictFormatVersion(final int formatVersion) {
return true;
// TODO: Use ver4 format.
return formatVersion == 2;
}
protected String getFileNameExtentionToOpenDict() {