diff options
| author |   Dan Zivkovic <zivkovic@google.com> | 2015-03-20 18:54:20 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 18:54:20 +0000 |
| commit | 8eecbbd618eb9b28d48afc21e852f7505b7cbba8 (patch) | |
| tree | 10284e6936748b8336d81d002027aedf49b9537c /java/src | |
| parent | 92d0dd0b837ddcd8179cddcf2fc202665d5357a3 (diff) | |
| parent | c15bbb52a37be751fed2ba7e765dfd7727306308 (diff) | |
| download | latinime-8eecbbd618eb9b28d48afc21e852f7505b7cbba8.tar.gz latinime-8eecbbd618eb9b28d48afc21e852f7505b7cbba8.tar.xz latinime-8eecbbd618eb9b28d48afc21e852f7505b7cbba8.zip | |
am c15bbb52: Retire Delight2 migration code to speed up tests.
* commit 'c15bbb52a37be751fed2ba7e765dfd7727306308':
Retire Delight2 migration code to speed up tests.
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java | 3 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/makedict/FormatSpec.java | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java index fa8fb2028..80daedd50 100644 --- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java @@ -121,8 +121,7 @@ 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 - || formatVersion == FormatSpec.VERSION402; + return 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 288261bf0..e422c4cd2 100644 --- a/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java +++ b/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java @@ -174,9 +174,6 @@ public final class FormatSpec { public static final int VERSION202 = 202; // format version for Fava Dictionaries. public static final int VERSION_DELIGHT3 = 86736212; - 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 VERSION402 = 402; public static final int VERSION403 = 403; public static final int VERSION4 = VERSION403; |