| commit | bcf477782a503f0ebf13455c6989e756ca2d902f | [log] [tgz] |
|---|---|---|
| author | Victor Chang <vichang@google.com> | Tue Jun 19 16:40:22 2018 +0100 |
| committer | vichang <vichang@google.com> | Wed Jun 20 09:48:44 2018 +0000 |
| tree | e27080d74bdbc52b910d2e73977c994c2a2dfb85 | |
| parent | afd5968d444ca6392cf206c8bb7a453fbdcd4f9a [diff] |
Increment the distro major release version for Android Q Bug: 82065726 Test: cts-tradefed run cts-dev -m CtsHostTzDataTests Test: cts-tradefed run cts-dev -m CtsLibcoreTestCases Test: FrameworksServicesTests fails due to an existing bug b/110419748 Change-Id: I74bf92d6d5aab4a2e2b4c17d4ea011918a5c56ee
diff --git a/distro/core/src/main/com/android/timezone/distro/DistroVersion.java b/distro/core/src/main/com/android/timezone/distro/DistroVersion.java index 5d87d28..9610d45 100644 --- a/distro/core/src/main/com/android/timezone/distro/DistroVersion.java +++ b/distro/core/src/main/com/android/timezone/distro/DistroVersion.java
@@ -32,7 +32,7 @@ * version to 1 when doing so. * This constant must match the one in system/core/tzdatacheck/tzdatacheck.cpp. */ - public static final int CURRENT_FORMAT_MAJOR_VERSION = 2; + public static final int CURRENT_FORMAT_MAJOR_VERSION = 3; // Android Q /** * The minor distro format version supported by this device. Increment this for
diff --git a/output_data/distro/distro.zip b/output_data/distro/distro.zip index 42fda0c..74f6b53 100644 --- a/output_data/distro/distro.zip +++ b/output_data/distro/distro.zip Binary files differ
diff --git a/testing/data/test1/output_data/distro/distro.zip b/testing/data/test1/output_data/distro/distro.zip index 6af0d03..60301fb 100644 --- a/testing/data/test1/output_data/distro/distro.zip +++ b/testing/data/test1/output_data/distro/distro.zip Binary files differ
diff --git a/testing/data/test2/output_data/distro/distro.zip b/testing/data/test2/output_data/distro/distro.zip index d02f4c9..c702ed0 100644 --- a/testing/data/test2/output_data/distro/distro.zip +++ b/testing/data/test2/output_data/distro/distro.zip Binary files differ
diff --git a/tzdatacheck/tzdatacheck.cpp b/tzdatacheck/tzdatacheck.cpp index c41d057..3d60f11 100644 --- a/tzdatacheck/tzdatacheck.cpp +++ b/tzdatacheck/tzdatacheck.cpp
@@ -56,7 +56,7 @@ // The major version of the distro format supported by this code as a null-terminated char[]. // See also com.android.timezone.distro.TimeZoneDistro / com.android.timezone.distro.DistroVersion. -static const char SUPPORTED_DISTRO_MAJOR_VERSION[] = "002"; +static const char SUPPORTED_DISTRO_MAJOR_VERSION[] = "003"; // The length of the distro format major version excluding the \0 static const size_t SUPPORTED_DISTRO_MAJOR_VERSION_LEN = sizeof(SUPPORTED_DISTRO_MAJOR_VERSION) - 1;