diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-10-31 14:22:32 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-10-31 14:22:32 +0000 |
| commit | 87af779f842a6b7dfc6a6ebf8af23f2204624dc0 (patch) | |
| tree | 82501efc7b922bf746ba4dbe7a24c29a5bbd17c6 /java | |
| parent | 304958b0de2c316f9de844c9d1e10c0f001f8d0b (diff) | |
| parent | b3bae2e89bdd6046ff6cc1fd0fe4be889e66ec17 (diff) | |
| download | latinime-87af779f842a6b7dfc6a6ebf8af23f2204624dc0.tar.gz latinime-87af779f842a6b7dfc6a6ebf8af23f2204624dc0.tar.xz latinime-87af779f842a6b7dfc6a6ebf8af23f2204624dc0.zip | |
am b3bae2e8: Merge "Update v4 format version from 402 to 403."
* commit 'b3bae2e89bdd6046ff6cc1fd0fe4be889e66ec17':
Update v4 format version from 402 to 403.
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java | 3 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/makedict/FormatSpec.java | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java index bbffece57..b47eaa9bb 100644 --- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java @@ -120,7 +120,8 @@ abstract public class ExpandableBinaryDictionary extends Dictionary { private static boolean needsToMigrateDictionary(final int formatVersion) { // When we bump up the dictionary format version, the old version should be added to here // for supporting migration. Note that native code has to support reading such formats. - return formatVersion == FormatSpec.VERSION4_ONLY_FOR_TESTING; + return formatVersion == FormatSpec.VERSION4_ONLY_FOR_TESTING + || formatVersion == FormatSpec.VERSION402; } public boolean isValidDictionaryLocked() { diff --git a/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java b/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java index 5925bdc4e..4ef504856 100644 --- a/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java +++ b/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java @@ -175,9 +175,10 @@ public final class FormatSpec { public static final int MINIMUM_SUPPORTED_VERSION_OF_CODE_POINT_TABLE = VERSION201; // Dictionary version used for testing. public static final int VERSION4_ONLY_FOR_TESTING = 399; - public static final int VERSION401 = 401; - public static final int VERSION4 = 402; - public static final int VERSION4_DEV = 403; + public static final int VERSION402 = 402; + public static final int VERSION403 = 403; + public static final int VERSION4 = VERSION403; + public static final int VERSION4_DEV = VERSION403; static final int MINIMUM_SUPPORTED_STATIC_VERSION = VERSION202; static final int MAXIMUM_SUPPORTED_STATIC_VERSION = VERSION202; static final int MINIMUM_SUPPORTED_DYNAMIC_VERSION = VERSION4; |