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

Commit 9266d9e4 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "More API council tidy up" am: 4e62ebd3 am: 0adba200 

Change-Id: I060f21bf30e5f8d4337ee16948f3d7fb6515eef5
parents 41ba5ce4 0adba200

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

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



            TimeZone timeZone = timeZoneMapping.getTimeZone();

            if (timeZone == null) {

                continue;

            }



            int candidateOffset = timeZone.getOffset(whenMillis);

            if (countryDefaultOffset != candidateOffset) {

                return true;
@@ -308,7 +304,7 @@ public class TimeZoneLookupHelper { 
        // be strong consistency across calls.

        synchronized (this) {

            if (mLastCountryTimeZones != null) {

                if (mLastCountryTimeZones.isForCountryCode(isoCountryCode)) {

                if (mLastCountryTimeZones.matchesCountryCode(isoCountryCode)) {

                    return mLastCountryTimeZones;

                }

            }