Merge "More API council tidy up" (4e62ebd3) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/TimeZoneLookupHelper.java

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -233,10 +233,6 @@ public class TimeZoneLookupHelper {
	}		}

	TimeZone timeZone = timeZoneMapping.getTimeZone();		TimeZone timeZone = timeZoneMapping.getTimeZone();
	if (timeZone == null) {
	continue;
	}

	int candidateOffset = timeZone.getOffset(whenMillis);		int candidateOffset = timeZone.getOffset(whenMillis);
	if (countryDefaultOffset != candidateOffset) {		if (countryDefaultOffset != candidateOffset) {
	return true;		return true;
	@@ -308,7 +304,7 @@ public class TimeZoneLookupHelper {
	// be strong consistency across calls.		// be strong consistency across calls.
	synchronized (this) {		synchronized (this) {
	if (mLastCountryTimeZones != null) {		if (mLastCountryTimeZones != null) {
	if (mLastCountryTimeZones.isForCountryCode(isoCountryCode)) {		if (mLastCountryTimeZones.matchesCountryCode(isoCountryCode)) {
	return mLastCountryTimeZones;		return mLastCountryTimeZones;
	}		}
	}		}