Merge "Simplify APIs exposed for time zone lookups" am: 07dcc4bc0f (e5c466d3) · Commits · e / os / android_frameworks_base

core/java/android/util/TimeUtils.java

+12 −5

Original line number	Original line	Diff line number	Diff line
	@@ -62,9 +62,9 @@ public class TimeUtils {
	}		}

	/**		/**
	* Tries to return a frozen ICU time zone that would have had the specified offset		* Returns a frozen ICU time zone that has / would have had the specified offset and DST value
	* and DST value at the specified moment in the specified country.		* at the specified moment in the specified country. Returns null if no suitable zone could be
	* Returns null if no suitable zone could be found.		* found.
	*/		*/
	private static android.icu.util.TimeZone getIcuTimeZone(		private static android.icu.util.TimeZone getIcuTimeZone(
	int offset, boolean dst, long when, String country) {		int offset, boolean dst, long when, String country) {
	@@ -73,8 +73,15 @@ public class TimeUtils {
	}		}

	android.icu.util.TimeZone bias = android.icu.util.TimeZone.getDefault();		android.icu.util.TimeZone bias = android.icu.util.TimeZone.getDefault();
	return TimeZoneFinder.getInstance()		CountryTimeZones countryTimeZones =
	.lookupTimeZoneByCountryAndOffset(country, offset, dst, when, bias);		TimeZoneFinder.getInstance().lookupCountryTimeZones(country);
			if (countryTimeZones == null) {
			return null;
			}

			CountryTimeZones.OffsetResult offsetResult =
			countryTimeZones.lookupByOffsetWithBias(offset, dst, when, bias);
			return offsetResult != null ? offsetResult.mTimeZone : null;
	}		}

	/**		/**