Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Track changes in system/timezone / libcore" am: 80a2e6e628

Browse Source 
am: 1015ddf86b

Change-Id: Ic738edf8465d4b8c0ad428aa1e693454db1bb445
This commit is contained in:
Neil Fuller
2018-11-19 04:14:05 -08:00
committed by android-build-merger
parent 4a66f9c79f 1015ddf86b
commit ee231b550e
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/preloaded-classes
View File

@@ -6162,6 +6162,7 @@ libcore.reflect.ParameterizedTypeImpl
libcore.reflect.TypeVariableImpl libcore.reflect.TypeVariableImpl
libcore.reflect.Types libcore.reflect.Types
libcore.reflect.WildcardTypeImpl libcore.reflect.WildcardTypeImpl
libcore.timezone.TimeZoneDataFiles
libcore.util.BasicLruCache libcore.util.BasicLruCache
libcore.util.CharsetUtils libcore.util.CharsetUtils
libcore.util.CollectionUtils libcore.util.CollectionUtils
@@ -6171,7 +6172,6 @@ libcore.util.NativeAllocationRegistry$CleanerRunner
libcore.util.NativeAllocationRegistry$CleanerThunk libcore.util.NativeAllocationRegistry$CleanerThunk
libcore.util.Objects libcore.util.Objects
libcore.util.SneakyThrow libcore.util.SneakyThrow
libcore.util.TimeZoneDataFiles
libcore.util.ZoneInfo libcore.util.ZoneInfo
libcore.util.ZoneInfo$CheckedArithmeticException libcore.util.ZoneInfo$CheckedArithmeticException
libcore.util.ZoneInfo$WallTime libcore.util.ZoneInfo$WallTime

5
services/core/java/com/android/server/timezone/RulesManagerService.java
View File

@@ -47,6 +47,7 @@ import java.util.Arrays;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import libcore.icu.ICU; import libcore.icu.ICU;
import libcore.timezone.TzDataSetVersion;
import libcore.util.TimeZoneFinder; import libcore.util.TimeZoneFinder;
import libcore.util.ZoneInfoDB; import libcore.util.ZoneInfoDB;
@@ -66,8 +67,8 @@ public final class RulesManagerService extends IRulesManager.Stub {
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
static final DistroFormatVersion DISTRO_FORMAT_VERSION_SUPPORTED = static final DistroFormatVersion DISTRO_FORMAT_VERSION_SUPPORTED =
new DistroFormatVersion( new DistroFormatVersion(
DistroVersion.CURRENT_FORMAT_MAJOR_VERSION, TzDataSetVersion.currentFormatMajorVersion(),
DistroVersion.CURRENT_FORMAT_MINOR_VERSION); TzDataSetVersion.currentFormatMinorVersion());
public static class Lifecycle extends SystemService { public static class Lifecycle extends SystemService {
public Lifecycle(Context context) { public Lifecycle(Context context) {

25
services/tests/servicestests/src/com/android/server/timezone/RulesManagerServiceTest.java
View File

@@ -40,6 +40,7 @@ import java.util.concurrent.Executor;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import libcore.io.IoUtils; 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_QUERY_PERMISSION;
import static com.android.server.timezone.RulesManagerService.REQUIRED_UPDATER_PERMISSION; import static com.android.server.timezone.RulesManagerService.REQUIRED_UPDATER_PERMISSION;
@@ -128,15 +129,15 @@ public class RulesManagerServiceTest {
configureDeviceSystemRulesVersion("2016a"); configureDeviceSystemRulesVersion("2016a");
DistroVersion stagedDistroVersion = new DistroVersion( DistroVersion stagedDistroVersion = new DistroVersion(
DistroVersion.CURRENT_FORMAT_MAJOR_VERSION, TzDataSetVersion.currentFormatMajorVersion(),
DistroVersion.CURRENT_FORMAT_MINOR_VERSION - 1, TzDataSetVersion.currentFormatMinorVersion() - 1,
"2016c", "2016c",
3); 3);
configureStagedInstall(stagedDistroVersion); configureStagedInstall(stagedDistroVersion);
DistroVersion installedDistroVersion = new DistroVersion( DistroVersion installedDistroVersion = new DistroVersion(
DistroVersion.CURRENT_FORMAT_MAJOR_VERSION, TzDataSetVersion.currentFormatMajorVersion(),
DistroVersion.CURRENT_FORMAT_MINOR_VERSION - 1, TzDataSetVersion.currentFormatMinorVersion() - 1,
"2016b", "2016b",
4); 4);
configureInstalledDistroVersion(installedDistroVersion); configureInstalledDistroVersion(installedDistroVersion);
@@ -162,8 +163,8 @@ public class RulesManagerServiceTest {
configureNoStagedOperation(); configureNoStagedOperation();
DistroVersion installedDistroVersion = new DistroVersion( DistroVersion installedDistroVersion = new DistroVersion(
DistroVersion.CURRENT_FORMAT_MAJOR_VERSION, TzDataSetVersion.currentFormatMajorVersion(),
DistroVersion.CURRENT_FORMAT_MINOR_VERSION - 1, TzDataSetVersion.currentFormatMinorVersion() - 1,
"2016b", "2016b",
4); 4);
configureInstalledDistroVersion(installedDistroVersion); configureInstalledDistroVersion(installedDistroVersion);
@@ -187,8 +188,8 @@ public class RulesManagerServiceTest {
configureStagedUninstall(); configureStagedUninstall();
DistroVersion installedDistroVersion = new DistroVersion( DistroVersion installedDistroVersion = new DistroVersion(
DistroVersion.CURRENT_FORMAT_MAJOR_VERSION, TzDataSetVersion.currentFormatMajorVersion(),
DistroVersion.CURRENT_FORMAT_MINOR_VERSION - 1, TzDataSetVersion.currentFormatMinorVersion() - 1,
"2016b", "2016b",
4); 4);
configureInstalledDistroVersion(installedDistroVersion); configureInstalledDistroVersion(installedDistroVersion);
@@ -231,8 +232,8 @@ public class RulesManagerServiceTest {
configureDeviceCannotReadStagedDistroOperation(); configureDeviceCannotReadStagedDistroOperation();
DistroVersion installedDistroVersion = new DistroVersion( DistroVersion installedDistroVersion = new DistroVersion(
DistroVersion.CURRENT_FORMAT_MAJOR_VERSION, TzDataSetVersion.currentFormatMajorVersion(),
DistroVersion.CURRENT_FORMAT_MINOR_VERSION - 1, TzDataSetVersion.currentFormatMinorVersion() - 1,
"2016b", "2016b",
4); 4);
configureInstalledDistroVersion(installedDistroVersion); configureInstalledDistroVersion(installedDistroVersion);
@@ -275,8 +276,8 @@ public class RulesManagerServiceTest {
configureDeviceSystemRulesVersion(systemRulesVersion); configureDeviceSystemRulesVersion(systemRulesVersion);
DistroVersion installedDistroVersion = new DistroVersion( DistroVersion installedDistroVersion = new DistroVersion(
DistroVersion.CURRENT_FORMAT_MAJOR_VERSION, TzDataSetVersion.currentFormatMajorVersion(),
DistroVersion.CURRENT_FORMAT_MINOR_VERSION - 1, TzDataSetVersion.currentFormatMinorVersion() - 1,
installedRulesVersion, installedRulesVersion,
revision); revision);
configureInstalledDistroVersion(installedDistroVersion); configureInstalledDistroVersion(installedDistroVersion);