aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorAdrian Velicu <adrianv@google.com>2014-11-14 03:45:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-14 03:45:32 +0000
commit39d50e7e7a353c65ebc3eeb5fcb602271d4ae839 (patch)
tree7ea4255fa55044844fec2f623b93cb916eed1b4b /java
parentd60f9c046e6e0ce8d3b04f93506f553f22af6240 (diff)
parentde29278592a15fbd61c4ab5052d45e1b137c7e9b (diff)
downloadlatinime-39d50e7e7a353c65ebc3eeb5fcb602271d4ae839.tar.gz
latinime-39d50e7e7a353c65ebc3eeb5fcb602271d4ae839.tar.xz
latinime-39d50e7e7a353c65ebc3eeb5fcb602271d4ae839.zip
Merge "UpdateHandler to support v202 dicts."
Diffstat (limited to 'java')
-rw-r--r--java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java4
-rw-r--r--java/src/com/android/inputmethod/latin/makedict/FormatSpec.java4
2 files changed, 5 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java b/java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java
index bd6152119..aeb666704 100644
--- a/java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java
+++ b/java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java
@@ -40,6 +40,7 @@ import com.android.inputmethod.compat.DownloadManagerCompatUtils;
import com.android.inputmethod.compat.NotificationCompatUtils;
import com.android.inputmethod.latin.R;
import com.android.inputmethod.latin.common.LocaleUtils;
+import com.android.inputmethod.latin.makedict.FormatSpec;
import com.android.inputmethod.latin.utils.ApplicationUtils;
import com.android.inputmethod.latin.utils.DebugLogUtils;
@@ -79,7 +80,8 @@ public final class UpdateHandler {
// DownloadManager uses as an ID numbers returned out of an AUTOINCREMENT column
// in SQLite, so it should never return anything < 0.
public static final int NOT_AN_ID = -1;
- public static final int MAXIMUM_SUPPORTED_FORMAT_VERSION = 2;
+ public static final int MAXIMUM_SUPPORTED_FORMAT_VERSION =
+ FormatSpec.MAXIMUM_SUPPORTED_STATIC_VERSION;
// Arbitrary. Probably good if it's a power of 2, and a couple thousand bytes long.
private static final int FILE_COPY_BUFFER_SIZE = 8192;
diff --git a/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java b/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java
index 4ef504856..eba9654a5 100644
--- a/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java
+++ b/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java
@@ -179,8 +179,8 @@ public final class FormatSpec {
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;
+ public static final int MINIMUM_SUPPORTED_STATIC_VERSION = VERSION202;
+ public static final int MAXIMUM_SUPPORTED_STATIC_VERSION = VERSION202;
static final int MINIMUM_SUPPORTED_DYNAMIC_VERSION = VERSION4;
static final int MAXIMUM_SUPPORTED_DYNAMIC_VERSION = VERSION4_DEV;