Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f436f5fd authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Track changes in system/timezone / libcore" am: 80a2e6e6 am: 1015ddf8 

am: ee231b55

Change-Id: I5cbd74fbee218b5846c813e9657cc7981719c46d
parents f7ee5ae5 ee231b55

config/preloaded-classes

+1 −1
Original line number Diff line number Diff line
@@ -6171,6 +6171,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
@@ -6180,7 +6181,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

services/core/java/com/android/server/timezone/RulesManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -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) {

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

+13 −12
Original line number Diff line number Diff line
@@ -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);