Merge "Remove code no longer used by telephony" (8e694529) · Commits · e / os / android_frameworks_base

core/java/android/util/TimeUtils.java

+3 −95

Original line number	Diff line number	Diff line
		@@ -18,30 +18,18 @@ package android.util;

		import android.os.SystemClock;

		import libcore.util.TimeZoneFinder;
		import libcore.util.ZoneInfoDB;

		import java.io.PrintWriter;
		import java.text.SimpleDateFormat;
		import java.util.ArrayList;
		import java.util.Calendar;
		import java.util.Collection;
		import java.util.Collections;
		import java.util.Date;
		import java.util.List;
		import libcore.util.TimeZoneFinder;
		import libcore.util.ZoneInfoDB;

		/**
		* A class containing utility methods related to time zones.
		*/
		public class TimeUtils {
		/** @hide */ public TimeUtils() {}
		private static final boolean DBG = false;
		private static final String TAG = "TimeUtils";

		/** Cached results of getTimeZonesWithUniqueOffsets */
		private static final Object sLastUniqueLockObj = new Object();
		private static List<String> sLastUniqueZoneOffsets = null;
		private static String sLastUniqueCountry = null;

		/** {@hide} */
		private static SimpleDateFormat sLoggingFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

		@@ -75,86 +63,6 @@ public class TimeUtils {
		.lookupTimeZoneByCountryAndOffset(country, offset, dst, when, bias);
		}

		/**
		* Returns an immutable list of unique time zone IDs for the country.
		*
		* @param country to find
		* @return unmodifiable list of unique time zones, maybe empty but never null.
		* @hide
		*/
		public static List<String> getTimeZoneIdsWithUniqueOffsets(String country) {
		synchronized(sLastUniqueLockObj) {
		if ((country != null) && country.equals(sLastUniqueCountry)) {
		if (DBG) {
		Log.d(TAG, "getTimeZonesWithUniqueOffsets(" +
		country + "): return cached version");
		}
		return sLastUniqueZoneOffsets;
		}
		}

		Collection<android.icu.util.TimeZone> zones = getIcuTimeZones(country);
		ArrayList<android.icu.util.TimeZone> uniqueTimeZones = new ArrayList<>();
		for (android.icu.util.TimeZone zone : zones) {
		// See if we already have this offset,
		// Using slow but space efficient and these are small.
		boolean found = false;
		for (int i = 0; i < uniqueTimeZones.size(); i++) {
		if (uniqueTimeZones.get(i).getRawOffset() == zone.getRawOffset()) {
		found = true;
		break;
		}
		}
		if (!found) {
		if (DBG) {
		Log.d(TAG, "getTimeZonesWithUniqueOffsets: add unique offset=" +
		zone.getRawOffset() + " zone.getID=" + zone.getID());
		}
		uniqueTimeZones.add(zone);
		}
		}

		synchronized(sLastUniqueLockObj) {
		// Cache the last result
		sLastUniqueZoneOffsets = extractZoneIds(uniqueTimeZones);
		sLastUniqueCountry = country;

		return sLastUniqueZoneOffsets;
		}
		}

		private static List<String> extractZoneIds(List<android.icu.util.TimeZone> timeZones) {
		List<String> ids = new ArrayList<>(timeZones.size());
		for (android.icu.util.TimeZone timeZone : timeZones) {
		ids.add(timeZone.getID());
		}
		return Collections.unmodifiableList(ids);
		}

		/**
		* Returns an immutable list of frozen ICU time zones for the country.
		*
		* @param countryIso is a two character country code.
		* @return TimeZone list, maybe empty but never null.
		* @hide
		*/
		private static List<android.icu.util.TimeZone> getIcuTimeZones(String countryIso) {
		if (countryIso == null) {
		if (DBG) Log.d(TAG, "getIcuTimeZones(null): return empty list");
		return Collections.emptyList();
		}
		List<android.icu.util.TimeZone> timeZones =
		TimeZoneFinder.getInstance().lookupTimeZonesByCountry(countryIso);
		if (timeZones == null) {
		if (DBG) {
		Log.d(TAG, "getIcuTimeZones(" + countryIso
		+ "): returned null, converting to empty list");
		}
		return Collections.emptyList();
		}
		return timeZones;
		}

		/**
		* Returns a String indicating the version of the time zone database currently
		* in use. The format of the string is dependent on the underlying time zone