am 3c7b603c: Merge "Start using Ver4 dictionary format."

* commit '3c7b603c46180ac8c6ec84c39719f72f0db08ffb':
  Start using Ver4 dictionary format.
main
Keisuke Kuroyanagi 2013-11-27 07:51:51 -08:00 committed by Android Git Automerger
commit a021d1d8e0
1 changed files with 5 additions and 3 deletions

View File

@ -60,7 +60,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
*/
protected static final int MAX_WORD_LENGTH = Constants.DICTIONARY_MAX_WORD_LENGTH;
private static final int DICTIONARY_FORMAT_VERSION = 3;
private static final int DICTIONARY_FORMAT_VERSION = 4;
private static final String SUPPORTS_DYNAMIC_UPDATE =
FormatSpec.FileHeader.ATTRIBUTE_VALUE_TRUE;
@ -238,7 +238,8 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
public void run() {
if (mDictionaryWriter == null) {
mBinaryDictionary.close();
final File file = new File(mContext.getFilesDir(), mFilename);
final File file = new File(mContext.getFilesDir(), mFilename + "/"
+ FormatSpec.TRIE_FILE_EXTENSION);
BinaryDictionary.createEmptyDictFile(file.getAbsolutePath(),
DICTIONARY_FORMAT_VERSION, getHeaderAttributeMap());
mBinaryDictionary = new BinaryDictionary(
@ -481,7 +482,8 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
+ mFilenameDictionaryUpdateController.mLastUpdateTime);
}
final File file = new File(mContext.getFilesDir(), mFilename);
final File file = new File(mContext.getFilesDir(), mFilename + "/"
+ FormatSpec.TRIE_FILE_EXTENSION);
final String filename = file.getAbsolutePath();
final long length = file.length();