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

Commit 0769745f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Tidy up libcore.timezone APIs" am: 8e0e0e85 

Change-Id: I0e15ce478bfaffb5defd0cfdb0e414f85bcf7af6
parents c01a08c3 8e0e0e85

core/java/android/timezone/CountryTimeZones.java

+4 −3
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public final class CountryTimeZones { 
         */

        @NonNull

        public String getTimeZoneId() {

            return mDelegate.timeZoneId;

            return mDelegate.getTimeZoneId();

        }



        /**
@@ -187,7 +187,7 @@ public final class CountryTimeZones { 
     * would be a good choice <em>generally</em> when there's no other information available.

     */

    public boolean isDefaultTimeZoneBoosted() {

        return mDelegate.getDefaultTimeZoneBoost();

        return mDelegate.isDefaultTimeZoneBoosted();

    }



    /**
@@ -220,7 +220,8 @@ public final class CountryTimeZones { 
                mDelegate.lookupByOffsetWithBias(

                        totalOffsetMillis, isDst, dstOffsetMillis, whenMillis, bias);

        return delegateOffsetResult == null ? null :

                new OffsetResult(delegateOffsetResult.mTimeZone, delegateOffsetResult.mOneMatch);

                new OffsetResult(

                        delegateOffsetResult.getTimeZone(), delegateOffsetResult.isOnlyMatch());

    }



    /**

core/java/android/timezone/TzDataSetVersion.java

+4 −4
Original line number Diff line number Diff line
@@ -111,23 +111,23 @@ public final class TzDataSetVersion { 


    /** Returns the major version number. See {@link TzDataSetVersion}. */

    public int getFormatMajorVersion() {

        return mDelegate.formatMajorVersion;

        return mDelegate.getFormatMajorVersion();

    }



    /** Returns the minor version number. See {@link TzDataSetVersion}. */

    public int getFormatMinorVersion() {

        return mDelegate.formatMinorVersion;

        return mDelegate.getFormatMinorVersion();

    }



    /** Returns the tzdb version string. See {@link TzDataSetVersion}. */

    @NonNull

    public String getRulesVersion() {

        return mDelegate.rulesVersion;

        return mDelegate.getRulesVersion();

    }



    /** Returns the Android revision. See {@link TzDataSetVersion}. */

    public int getRevision() {

        return mDelegate.revision;

        return mDelegate.getRevision();

    }



    @Override

core/java/android/util/TimeUtils.java

+3 −3
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public class TimeUtils { 
        }

        CountryTimeZones.OffsetResult offsetResult = countryTimeZones.lookupByOffsetWithBias(

                offsetMillis, isDst, null /* dstOffsetMillis */, whenMillis, bias);

        return offsetResult != null ? offsetResult.mTimeZone : null;

        return offsetResult != null ? offsetResult.getTimeZone() : null;

    }



    /**
@@ -108,8 +108,8 @@ public class TimeUtils { 


        List<String> timeZoneIds = new ArrayList<>();

        for (TimeZoneMapping timeZoneMapping : countryTimeZones.getTimeZoneMappings()) {

            if (timeZoneMapping.showInPicker) {

                timeZoneIds.add(timeZoneMapping.timeZoneId);

            if (timeZoneMapping.isShownInPicker()) {

                timeZoneIds.add(timeZoneMapping.getTimeZoneId());

            }

        }

        return Collections.unmodifiableList(timeZoneIds);

packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ public class ZoneGetter { 
        private static List<String> extractTimeZoneIds(List<TimeZoneMapping> timeZoneMappings) {

            final List<String> zoneIds = new ArrayList<>(timeZoneMappings.size());

            for (TimeZoneMapping timeZoneMapping : timeZoneMappings) {

                zoneIds.add(timeZoneMapping.timeZoneId);

                zoneIds.add(timeZoneMapping.getTimeZoneId());

            }

            return Collections.unmodifiableList(zoneIds);

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ public final class RulesManagerService extends IRulesManager.Stub { 
                    Slog.w(TAG, "Failed to read staged distro.", e);

                }

            }

            return new RulesState(baseVersion.rulesVersion, DISTRO_FORMAT_VERSION_SUPPORTED,

            return new RulesState(baseVersion.getRulesVersion(), DISTRO_FORMAT_VERSION_SUPPORTED,

                    operationInProgress, stagedOperationStatus, stagedDistroRulesVersion,

                    distroStatus, installedDistroRulesVersion);

        }