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

Commit 1290b89d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove libcore.icu.TimeZoneNames.forLocale usage"

parents a0883b9e 1cc722bd
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.TimeZone;
import libcore.util.TimeZoneFinder;

/**
 * ZoneGetter is the utility class to get time zone and zone list, and both of them have display
@@ -376,10 +377,9 @@ public class ZoneGetter {
            }

            // Create a lookup of local zone IDs.
            localZoneIds = new HashSet<String>();
            for (String olsonId : libcore.icu.TimeZoneNames.forLocale(locale)) {
                localZoneIds.add(olsonId);
            }
            List<String> zoneIds =
                    TimeZoneFinder.getInstance().lookupTimeZoneIdsByCountry(locale.getCountry());
            localZoneIds = new HashSet<>(zoneIds);
        }
    }
}