am e17cc827: Merge "Increment version number of ver4 format to 401."

* commit 'e17cc8270f280e998a7500abd375b8870e07af65':
  Increment version number of ver4 format to 401.
main
Keisuke Kuroyanagi 2013-12-16 06:58:45 -08:00 committed by Android Git Automerger
commit 222fc65881
2 changed files with 2 additions and 2 deletions

View File

@ -188,7 +188,7 @@ public final class FormatSpec {
// us to change the format during development while having testing devices remove // us to change the format during development while having testing devices remove
// older files with each upgrade, while still having a readable versioning scheme. // older files with each upgrade, while still having a readable versioning scheme.
public static final int VERSION2 = 2; 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 MINIMUM_SUPPORTED_VERSION = VERSION2;
static final int MAXIMUM_SUPPORTED_VERSION = VERSION4; static final int MAXIMUM_SUPPORTED_VERSION = VERSION4;

View File

@ -31,7 +31,7 @@ class FormatUtils {
enum FORMAT_VERSION { enum FORMAT_VERSION {
// These MUST have the same values as the relevant constants in FormatSpec.java. // These MUST have the same values as the relevant constants in FormatSpec.java.
VERSION_2 = 2, VERSION_2 = 2,
VERSION_4 = 400, VERSION_4 = 401,
UNKNOWN_VERSION = -1 UNKNOWN_VERSION = -1
}; };