Merge "Remove time_zones_by_country.xml file" (3436fd48) · Commits · e / os / android_frameworks_base

core/java/android/util/TimeUtils.java

+54 −116

Original line number	Original line	Diff line number	Diff line
	@@ -16,25 +16,17 @@

	package android.util;		package android.util;

	import android.content.res.Resources;
	import android.content.res.XmlResourceParser;
	import android.os.SystemClock;		import android.os.SystemClock;
	import android.text.format.DateUtils;

	import com.android.internal.util.XmlUtils;

	import org.xmlpull.v1.XmlPullParser;
	import org.xmlpull.v1.XmlPullParserException;

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

	/**		/**
	@@ -45,14 +37,9 @@ public class TimeUtils {
	private static final boolean DBG = false;		private static final boolean DBG = false;
	private static final String TAG = "TimeUtils";		private static final String TAG = "TimeUtils";

	/** Cached results of getTineZones */
	private static final Object sLastLockObj = new Object();
	private static ArrayList<TimeZone> sLastZones = null;
	private static String sLastCountry = null;

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

	/** {@hide} */		/** {@hide} */
	@@ -63,50 +50,39 @@ public class TimeUtils {
	* and DST value at the specified moment in the specified country.		* and DST value at the specified moment in the specified country.
	* Returns null if no suitable zone could be found.		* Returns null if no suitable zone could be found.
	*/		*/
	public static TimeZone getTimeZone(int offset, boolean dst, long when, String country) {		public static java.util.TimeZone getTimeZone(
	TimeZone best = null;		int offset, boolean dst, long when, String country) {
	final Date d = new Date(when);

	TimeZone current = TimeZone.getDefault();
	String currentName = current.getID();
	int currentOffset = current.getOffset(when);
	boolean currentDst = current.inDaylightTime(d);

	for (TimeZone tz : getTimeZones(country)) {		android.icu.util.TimeZone icuTimeZone = getIcuTimeZone(offset, dst, when, country);
	// If the current time zone is from the right country		// We must expose a java.util.TimeZone here for API compatibility because this is a public
	// and meets the other known properties, keep it		// API method.
	// instead of changing to another one.		return icuTimeZone != null ? java.util.TimeZone.getTimeZone(icuTimeZone.getID()) : null;

	if (tz.getID().equals(currentName)) {
	if (currentOffset == offset && currentDst == dst) {
	return current;
	}
	}		}

	// Otherwise, take the first zone from the right		/**
	// country that has the correct current offset and DST.		* Tries to return a frozen ICU time zone that would have had the specified offset
	// (Keep iterating instead of returning in case we		* and DST value at the specified moment in the specified country.
	// haven't encountered the current time zone yet.)		* Returns null if no suitable zone could be found.
			*/
	if (best == null) {		private static android.icu.util.TimeZone getIcuTimeZone(
	if (tz.getOffset(when) == offset &&		int offset, boolean dst, long when, String country) {
	tz.inDaylightTime(d) == dst) {		if (country == null) {
	best = tz;		return null;
	}
	}
	}		}

	return best;		android.icu.util.TimeZone bias = android.icu.util.TimeZone.getDefault();
			return TimeZoneFinder.getInstance()
			.lookupTimeZoneByCountryAndOffset(country, offset, dst, when, bias);
	}		}

	/**		/**
	* Return list of unique time zones for the country. Do not modify		* Returns an immutable list of unique time zone IDs for the country.
	*		*
	* @param country to find		* @param country to find
	* @return list of unique time zones, maybe empty but never null. Do not modify.		* @return unmodifiable list of unique time zones, maybe empty but never null.
	* @hide		* @hide
	*/		*/
	public static ArrayList<TimeZone> getTimeZonesWithUniqueOffsets(String country) {		public static List<String> getTimeZoneIdsWithUniqueOffsets(String country) {
	synchronized(sLastUniqueLockObj) {		synchronized(sLastUniqueLockObj) {
	if ((country != null) && country.equals(sLastUniqueCountry)) {		if ((country != null) && country.equals(sLastUniqueCountry)) {
	if (DBG) {		if (DBG) {
	@@ -117,9 +93,9 @@ public class TimeUtils {
	}		}
	}		}

	Collection<TimeZone> zones = getTimeZones(country);		Collection<android.icu.util.TimeZone> zones = getIcuTimeZones(country);
	ArrayList<TimeZone> uniqueTimeZones = new ArrayList<TimeZone>();		ArrayList<android.icu.util.TimeZone> uniqueTimeZones = new ArrayList<>();
	for (TimeZone zone : zones) {		for (android.icu.util.TimeZone zone : zones) {
	// See if we already have this offset,		// See if we already have this offset,
	// Using slow but space efficient and these are small.		// Using slow but space efficient and these are small.
	boolean found = false;		boolean found = false;
	@@ -129,7 +105,7 @@ public class TimeUtils {
	break;		break;
	}		}
	}		}
	if (found == false) {		if (!found) {
	if (DBG) {		if (DBG) {
	Log.d(TAG, "getTimeZonesWithUniqueOffsets: add unique offset=" +		Log.d(TAG, "getTimeZonesWithUniqueOffsets: add unique offset=" +
	zone.getRawOffset() + " zone.getID=" + zone.getID());		zone.getRawOffset() + " zone.getID=" + zone.getID());
	@@ -140,81 +116,43 @@ public class TimeUtils {

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

	return sLastUniqueZoneOffsets;		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 the time zones for the country, which is the code		* Returns an immutable list of frozen ICU time zones for the country.
	* attribute of the timezone element in time_zones_by_country.xml. Do not modify.
	*		*
	* @param country is a two character country code.		* @param countryIso is a two character country code.
	* @return TimeZone list, maybe empty but never null. Do not modify.		* @return TimeZone list, maybe empty but never null.
	* @hide		* @hide
	*/		*/
	public static ArrayList<TimeZone> getTimeZones(String country) {		private static List<android.icu.util.TimeZone> getIcuTimeZones(String countryIso) {
	synchronized (sLastLockObj) {		if (countryIso == null) {
	if ((country != null) && country.equals(sLastCountry)) {		if (DBG) Log.d(TAG, "getIcuTimeZones(null): return empty list");
	if (DBG) Log.d(TAG, "getTimeZones(" + country + "): return cached version");		return Collections.emptyList();
	return sLastZones;		}
	}		List<android.icu.util.TimeZone> timeZones =
	}		TimeZoneFinder.getInstance().lookupTimeZonesByCountry(countryIso);
			if (timeZones == null) {
	ArrayList<TimeZone> tzs = new ArrayList<TimeZone>();

	if (country == null) {
	if (DBG) Log.d(TAG, "getTimeZones(null): return empty list");
	return tzs;
	}

	Resources r = Resources.getSystem();
	XmlResourceParser parser = r.getXml(com.android.internal.R.xml.time_zones_by_country);

	try {
	XmlUtils.beginDocument(parser, "timezones");

	while (true) {
	XmlUtils.nextElement(parser);

	String element = parser.getName();
	if (element == null \|\| !(element.equals("timezone"))) {
	break;
	}

	String code = parser.getAttributeValue(null, "code");

	if (country.equals(code)) {
	if (parser.next() == XmlPullParser.TEXT) {
	String zoneIdString = parser.getText();
	TimeZone tz = TimeZone.getTimeZone(zoneIdString);
	if (tz.getID().startsWith("GMT") == false) {
	// tz.getID doesn't start not "GMT" so its valid
	tzs.add(tz);
	if (DBG) {		if (DBG) {
	Log.d(TAG, "getTimeZone('" + country + "'): found tz.getID=="		Log.d(TAG, "getIcuTimeZones(" + countryIso
	+ ((tz != null) ? tz.getID() : "<no tz>"));		+ "): returned null, converting to empty list");
	}
	}
	}		}
			return Collections.emptyList();
	}		}
	}		return timeZones;
	} catch (XmlPullParserException e) {
	Log.e(TAG, "Got xml parser exception getTimeZone('" + country + "'): e=", e);
	} catch (IOException e) {
	Log.e(TAG, "Got IO exception getTimeZone('" + country + "'): e=", e);
	} finally {
	parser.close();
	}

	synchronized(sLastLockObj) {
	// Cache the last result;
	sLastZones = tzs;
	sLastCountry = country;
	return sLastZones;
	}
	}		}

	/**		/**

core/res/res/values/symbols.xml

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1433,7 +1433,6 @@
	<java-symbol type="xml" name="password_kbd_symbols" />		<java-symbol type="xml" name="password_kbd_symbols" />
	<java-symbol type="xml" name="password_kbd_symbols_shift" />		<java-symbol type="xml" name="password_kbd_symbols_shift" />
	<java-symbol type="xml" name="power_profile" />		<java-symbol type="xml" name="power_profile" />
	<java-symbol type="xml" name="time_zones_by_country" />
	<java-symbol type="xml" name="sms_short_codes" />		<java-symbol type="xml" name="sms_short_codes" />
	<java-symbol type="xml" name="audio_assets" />		<java-symbol type="xml" name="audio_assets" />
	<java-symbol type="xml" name="global_keys" />		<java-symbol type="xml" name="global_keys" />

core/res/res/xml/time_zones_by_country.xml

deleted100644 → 0

+0 −1372

File deleted.

Preview size limit exceeded, changes collapsed.