From 0ac8df0e9a136c2eb791c8eae953804cb6db6954 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Fri, 16 Nov 2018 16:19:26 +0000 Subject: [PATCH] Track changes in system/timezone / libcore The version information about time zone formats is moving to a new libcore class TzDataSetVersion. Bug: 119026403 Test: build Change-Id: I6f80f16f9cd7e37fc04d75c89483497f4f00a6a5 --- config/preloaded-classes | 2 +- .../server/timezone/RulesManagerService.java | 5 ++-- .../timezone/RulesManagerServiceTest.java | 25 ++++++++++--------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/config/preloaded-classes b/config/preloaded-classes index d93befdf5143d..9496c37c43969 100644 --- a/config/preloaded-classes +++ b/config/preloaded-classes @@ -6162,6 +6162,7 @@ libcore.reflect.ParameterizedTypeImpl libcore.reflect.TypeVariableImpl libcore.reflect.Types libcore.reflect.WildcardTypeImpl +libcore.timezone.TimeZoneDataFiles libcore.util.BasicLruCache libcore.util.CharsetUtils libcore.util.CollectionUtils @@ -6171,7 +6172,6 @@ libcore.util.NativeAllocationRegistry$CleanerRunner libcore.util.NativeAllocationRegistry$CleanerThunk libcore.util.Objects libcore.util.SneakyThrow -libcore.util.TimeZoneDataFiles libcore.util.ZoneInfo libcore.util.ZoneInfo$CheckedArithmeticException libcore.util.ZoneInfo$WallTime diff --git a/services/core/java/com/android/server/timezone/RulesManagerService.java b/services/core/java/com/android/server/timezone/RulesManagerService.java index 23c4a337001b7..c4d285115ce7e 100644 --- a/services/core/java/com/android/server/timezone/RulesManagerService.java +++ b/services/core/java/com/android/server/timezone/RulesManagerService.java @@ -47,6 +47,7 @@ import java.util.Arrays; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicBoolean; import libcore.icu.ICU; +import libcore.timezone.TzDataSetVersion; import libcore.util.TimeZoneFinder; import libcore.util.ZoneInfoDB; @@ -66,8 +67,8 @@ public final class RulesManagerService extends IRulesManager.Stub { @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) static final DistroFormatVersion DISTRO_FORMAT_VERSION_SUPPORTED = new DistroFormatVersion( - DistroVersion.CURRENT_FORMAT_MAJOR_VERSION, - DistroVersion.CURRENT_FORMAT_MINOR_VERSION); + TzDataSetVersion.currentFormatMajorVersion(), + TzDataSetVersion.currentFormatMinorVersion()); public static class Lifecycle extends SystemService { public Lifecycle(Context context) { diff --git a/services/tests/servicestests/src/com/android/server/timezone/RulesManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/timezone/RulesManagerServiceTest.java index c252609b5d88b..1b106dd371638 100644 --- a/services/tests/servicestests/src/com/android/server/timezone/RulesManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/timezone/RulesManagerServiceTest.java @@ -40,6 +40,7 @@ import java.util.concurrent.Executor; import javax.annotation.Nullable; import libcore.io.IoUtils; +import libcore.timezone.TzDataSetVersion; import static com.android.server.timezone.RulesManagerService.REQUIRED_QUERY_PERMISSION; import static com.android.server.timezone.RulesManagerService.REQUIRED_UPDATER_PERMISSION; @@ -128,15 +129,15 @@ public class RulesManagerServiceTest { configureDeviceSystemRulesVersion("2016a"); DistroVersion stagedDistroVersion = new DistroVersion( - DistroVersion.CURRENT_FORMAT_MAJOR_VERSION, - DistroVersion.CURRENT_FORMAT_MINOR_VERSION - 1, + TzDataSetVersion.currentFormatMajorVersion(), + TzDataSetVersion.currentFormatMinorVersion() - 1, "2016c", 3); configureStagedInstall(stagedDistroVersion); DistroVersion installedDistroVersion = new DistroVersion( - DistroVersion.CURRENT_FORMAT_MAJOR_VERSION, - DistroVersion.CURRENT_FORMAT_MINOR_VERSION - 1, + TzDataSetVersion.currentFormatMajorVersion(), + TzDataSetVersion.currentFormatMinorVersion() - 1, "2016b", 4); configureInstalledDistroVersion(installedDistroVersion); @@ -162,8 +163,8 @@ public class RulesManagerServiceTest { configureNoStagedOperation(); DistroVersion installedDistroVersion = new DistroVersion( - DistroVersion.CURRENT_FORMAT_MAJOR_VERSION, - DistroVersion.CURRENT_FORMAT_MINOR_VERSION - 1, + TzDataSetVersion.currentFormatMajorVersion(), + TzDataSetVersion.currentFormatMinorVersion() - 1, "2016b", 4); configureInstalledDistroVersion(installedDistroVersion); @@ -187,8 +188,8 @@ public class RulesManagerServiceTest { configureStagedUninstall(); DistroVersion installedDistroVersion = new DistroVersion( - DistroVersion.CURRENT_FORMAT_MAJOR_VERSION, - DistroVersion.CURRENT_FORMAT_MINOR_VERSION - 1, + TzDataSetVersion.currentFormatMajorVersion(), + TzDataSetVersion.currentFormatMinorVersion() - 1, "2016b", 4); configureInstalledDistroVersion(installedDistroVersion); @@ -231,8 +232,8 @@ public class RulesManagerServiceTest { configureDeviceCannotReadStagedDistroOperation(); DistroVersion installedDistroVersion = new DistroVersion( - DistroVersion.CURRENT_FORMAT_MAJOR_VERSION, - DistroVersion.CURRENT_FORMAT_MINOR_VERSION - 1, + TzDataSetVersion.currentFormatMajorVersion(), + TzDataSetVersion.currentFormatMinorVersion() - 1, "2016b", 4); configureInstalledDistroVersion(installedDistroVersion); @@ -275,8 +276,8 @@ public class RulesManagerServiceTest { configureDeviceSystemRulesVersion(systemRulesVersion); DistroVersion installedDistroVersion = new DistroVersion( - DistroVersion.CURRENT_FORMAT_MAJOR_VERSION, - DistroVersion.CURRENT_FORMAT_MINOR_VERSION - 1, + TzDataSetVersion.currentFormatMajorVersion(), + TzDataSetVersion.currentFormatMinorVersion() - 1, installedRulesVersion, revision); configureInstalledDistroVersion(installedDistroVersion);