aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2013-12-16 06:58:45 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-16 06:58:45 -0800
commit222fc6588183e84d4ffc0ea5a9f1fa1ba31725fb (patch)
tree6932db1dab77532a207e9d980544a1e6be193bfc
parent3a98fcb3ee2ed869e6d007776c86fb043fefd4f6 (diff)
parente17cc8270f280e998a7500abd375b8870e07af65 (diff)
downloadlatinime-222fc6588183e84d4ffc0ea5a9f1fa1ba31725fb.tar.gz
latinime-222fc6588183e84d4ffc0ea5a9f1fa1ba31725fb.tar.xz
latinime-222fc6588183e84d4ffc0ea5a9f1fa1ba31725fb.zip
am e17cc827: Merge "Increment version number of ver4 format to 401."
* commit 'e17cc8270f280e998a7500abd375b8870e07af65': Increment version number of ver4 format to 401.
-rw-r--r--java/src/com/android/inputmethod/latin/makedict/FormatSpec.java2
-rw-r--r--native/jni/src/suggest/policyimpl/dictionary/utils/format_utils.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java b/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java
index af54805f7..437fa942b 100644
--- a/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java
+++ b/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java
@@ -188,7 +188,7 @@ public final class FormatSpec {
// us to change the format during development while having testing devices remove
// older files with each upgrade, while still having a readable versioning scheme.
public static final int VERSION2 = 2;
- public static final int VERSION4 = 400;
+ public static final int VERSION4 = 401;
static final int MINIMUM_SUPPORTED_VERSION = VERSION2;
static final int MAXIMUM_SUPPORTED_VERSION = VERSION4;
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/format_utils.h b/native/jni/src/suggest/policyimpl/dictionary/utils/format_utils.h
index eb2227d60..7c6a21dd7 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/format_utils.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/utils/format_utils.h
@@ -31,7 +31,7 @@ class FormatUtils {
enum FORMAT_VERSION {
// These MUST have the same values as the relevant constants in FormatSpec.java.
VERSION_2 = 2,
- VERSION_4 = 400,
+ VERSION_4 = 401,
UNKNOWN_VERSION = -1
};