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

Commit 402674f2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Rename ZoneInfoDB -> ZoneInfoDb"

parents 3d0bb1d6 f14b18e1

core/java/android/app/AlarmManager.java

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import android.util.ArrayMap; 
import android.util.Log;

import android.util.proto.ProtoOutputStream;



import libcore.timezone.ZoneInfoDB;

import libcore.timezone.ZoneInfoDb;



import java.io.IOException;

import java.lang.annotation.Retention;
@@ -1000,7 +1000,7 @@ public class AlarmManager { 
        if (mTargetSdkVersion >= Build.VERSION_CODES.M) {

            boolean hasTimeZone = false;

            try {

                hasTimeZone = ZoneInfoDB.getInstance().hasTimeZone(timeZone);

                hasTimeZone = ZoneInfoDb.getInstance().hasTimeZone(timeZone);

            } catch (IOException ignored) {

            }

core/java/android/text/format/Time.java

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package android.text.format; 


import android.util.TimeFormatException;



import libcore.timezone.ZoneInfoDB;

import libcore.timezone.ZoneInfoDb;

import libcore.util.ZoneInfo;



import java.io.IOException;
@@ -1107,9 +1107,9 @@ public class Time { 


        private static ZoneInfo lookupZoneInfo(String timezoneId) {

            try {

                ZoneInfo zoneInfo = ZoneInfoDB.getInstance().makeTimeZone(timezoneId);

                ZoneInfo zoneInfo = ZoneInfoDb.getInstance().makeTimeZone(timezoneId);

                if (zoneInfo == null) {

                    zoneInfo = ZoneInfoDB.getInstance().makeTimeZone("GMT");

                    zoneInfo = ZoneInfoDb.getInstance().makeTimeZone("GMT");

                }

                if (zoneInfo == null) {

                    throw new AssertionError("GMT not found: \"" + timezoneId + "\"");

core/java/android/timezone/ZoneInfoDb.java

+3 −3
Original line number Diff line number Diff line
@@ -43,16 +43,16 @@ public final class ZoneInfoDb { 
    public static ZoneInfoDb getInstance() {

        synchronized (sLock) {

            if (sInstance == null) {

                sInstance = new ZoneInfoDb(libcore.timezone.ZoneInfoDB.getInstance());

                sInstance = new ZoneInfoDb(libcore.timezone.ZoneInfoDb.getInstance());

            }

        }

        return sInstance;

    }



    @NonNull

    private final libcore.timezone.ZoneInfoDB mDelegate;

    private final libcore.timezone.ZoneInfoDb mDelegate;



    private ZoneInfoDb(libcore.timezone.ZoneInfoDB delegate) {

    private ZoneInfoDb(libcore.timezone.ZoneInfoDb delegate) {

        mDelegate = Objects.requireNonNull(delegate);

    }

core/java/android/util/TimeUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import android.os.SystemClock; 
import libcore.timezone.CountryTimeZones;

import libcore.timezone.CountryTimeZones.TimeZoneMapping;

import libcore.timezone.TimeZoneFinder;

import libcore.timezone.ZoneInfoDB;

import libcore.timezone.ZoneInfoDb;



import java.io.PrintWriter;

import java.text.SimpleDateFormat;
@@ -133,7 +133,7 @@ public class TimeUtils { 
     * during the lifetime of an activity.

     */

    public static String getTimeZoneDatabaseVersion() {

        return ZoneInfoDB.getInstance().getVersion();

        return ZoneInfoDb.getInstance().getVersion();

    }



    /** @hide Field length that can hold 999 days of time */

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

+4 −4
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ import com.android.timezone.distro.installer.TimeZoneDistroInstaller; 
import libcore.timezone.TimeZoneDataFiles;

import libcore.timezone.TimeZoneFinder;

import libcore.timezone.TzDataSetVersion;

import libcore.timezone.ZoneInfoDB;

import libcore.timezone.ZoneInfoDb;



import java.io.File;

import java.io.FileDescriptor;
@@ -518,9 +518,9 @@ public final class RulesManagerService extends IRulesManager.Stub { 
                        case 'a': {

                            // Report the active rules version (i.e. the rules in use by the current

                            // process).

                            pw.println("Active rules version (ICU, ZoneInfoDB, TimeZoneFinder): "

                            pw.println("Active rules version (ICU, ZoneInfoDb, TimeZoneFinder): "

                                    + TimeZone.getTZDataVersion() + ","

                                    + ZoneInfoDB.getInstance().getVersion() + ","

                                    + ZoneInfoDb.getInstance().getVersion() + ","

                                    + TimeZoneFinder.getInstance().getIanaVersion());

                            break;

                        }
@@ -536,7 +536,7 @@ public final class RulesManagerService extends IRulesManager.Stub { 
        pw.println("RulesManagerService state: " + toString());

        pw.println("Active rules version (ICU, ZoneInfoDB, TimeZoneFinder): "

                + TimeZone.getTZDataVersion() + ","

                + ZoneInfoDB.getInstance().getVersion() + ","

                + ZoneInfoDb.getInstance().getVersion() + ","

                + TimeZoneFinder.getInstance().getIanaVersion());

        pw.println("Distro state: " + rulesState.toString());

        mPackageTracker.dump(pw);