am 39d50e7e: Merge "UpdateHandler to support v202 dicts."

* commit '39d50e7e7a353c65ebc3eeb5fcb602271d4ae839':
  UpdateHandler to support v202 dicts.
main
Adrian Velicu 2014-11-14 03:48:55 +00:00 committed by Android Git Automerger
commit 0fa33ea40a
2 changed files with 5 additions and 3 deletions

View File

@ -40,6 +40,7 @@ import com.android.inputmethod.compat.DownloadManagerCompatUtils;
import com.android.inputmethod.compat.NotificationCompatUtils; import com.android.inputmethod.compat.NotificationCompatUtils;
import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.R;
import com.android.inputmethod.latin.common.LocaleUtils; 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.ApplicationUtils;
import com.android.inputmethod.latin.utils.DebugLogUtils; 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 // DownloadManager uses as an ID numbers returned out of an AUTOINCREMENT column
// in SQLite, so it should never return anything < 0. // in SQLite, so it should never return anything < 0.
public static final int NOT_AN_ID = -1; 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. // 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; private static final int FILE_COPY_BUFFER_SIZE = 8192;

View File

@ -179,8 +179,8 @@ public final class FormatSpec {
public static final int VERSION403 = 403; public static final int VERSION403 = 403;
public static final int VERSION4 = VERSION403; public static final int VERSION4 = VERSION403;
public static final int VERSION4_DEV = VERSION403; public static final int VERSION4_DEV = VERSION403;
static final int MINIMUM_SUPPORTED_STATIC_VERSION = VERSION202; public static final int MINIMUM_SUPPORTED_STATIC_VERSION = VERSION202;
static final int MAXIMUM_SUPPORTED_STATIC_VERSION = VERSION202; public static final int MAXIMUM_SUPPORTED_STATIC_VERSION = VERSION202;
static final int MINIMUM_SUPPORTED_DYNAMIC_VERSION = VERSION4; static final int MINIMUM_SUPPORTED_DYNAMIC_VERSION = VERSION4;
static final int MAXIMUM_SUPPORTED_DYNAMIC_VERSION = VERSION4_DEV; static final int MAXIMUM_SUPPORTED_DYNAMIC_VERSION = VERSION4_DEV;