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

Commit ab9f1d6b authored by Neil Fuller's avatar Neil Fuller
Browse files

Track changes in libcore's API 

Track changes in libcore's API lookupByOffsetWithBias().

The method args have been configured so that the behavior should
stay the same for most cases. Only if the NITZ DST information is
missing will there be a change, and it should mean better matching
behavior. See the comment added in the code for more information.

Bug: 139091367
Bug: 140712361
Test: treehugger
Change-Id: I0b9ff076e1d60196477fab404578100eb89c548f
parent d8b9905f

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

+8 −2
Original line number Diff line number Diff line
@@ -188,10 +188,16 @@ public class TimeZoneLookupHelper { 
        }

        TimeZone bias = TimeZone.getDefault();



        // Android NITZ time zone matching doesn't try to do a precise match using the DST offset

        // supplied by the carrier. It only considers whether or not the carrier suggests local time

        // is DST (if known). NITZ is limited in only being able to express DST offsets in whole

        // hours and the DST info is optional.

        Integer dstAdjustmentMillis = nitzData.getDstAdjustmentMillis();

        Boolean isDst = dstAdjustmentMillis == null ? null : dstAdjustmentMillis != 0;

        Integer dstAdjustmentMillisToMatch = null; // Don't try to match the precise DST offset.

        CountryTimeZones.OffsetResult offsetResult = countryTimeZones.lookupByOffsetWithBias(

                nitzData.getLocalOffsetMillis(), nitzData.isDst(),

                nitzData.getLocalOffsetMillis(), isDst, dstAdjustmentMillisToMatch,

                nitzData.getCurrentTimeInMillis(), bias);



        if (offsetResult == null) {

            return null;

        }

tests/telephonytests/src/com/android/internal/telephony/TimeZoneLookupHelperTest.java

+32 −11
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class TimeZoneLookupHelperTest { 
    }



    @Test

    public void testLookupByNitzdByNitz() {

    public void testLookupByNitzByNitz() {

        // Historical dates are used to avoid the test breaking due to data changes.

        // However, algorithm updates may change the exact time zone returned, though it shouldn't

        // ever be a less exact match.
@@ -215,7 +215,7 @@ public class TimeZoneLookupHelperTest { 
        String summerTimeNitzString = "15/06/20,01:02:03+8"; // 2015-06-20 01:02:03 UTC, UTC+2

        String winterTimeNitzString = "15/01/20,01:02:03+4"; // 2015-01-20 01:02:03 UTC, UTC+1



        // Summer, known DST state (DST == true).

        // Summer, known & correct DST state (DST == true).

        {

            String summerTimeNitzStringWithDst = summerTimeNitzString + ",1";

            NitzData nitzData = NitzData.parse(summerTimeNitzStringWithDst);
@@ -234,10 +234,20 @@ public class TimeZoneLookupHelperTest { 
            assertOffsetResultZoneCountry(adIso, adSummerWithDstResult);

        }



        // Winter, known DST state (DST == false)

        // Summer, known & incorrect DST state (DST == false)

        {

            String winterTimeNitzStringWithDst = winterTimeNitzString + ",0";

            NitzData nitzData = NitzData.parse(winterTimeNitzStringWithDst);

            String summerTimeNitzStringWithNoDst = summerTimeNitzString + ",0";

            NitzData nitzData = NitzData.parse(summerTimeNitzStringWithNoDst);



            OffsetResult adSummerWithNoDstResult =

                    mTimeZoneLookupHelper.lookupByNitzCountry(nitzData, adIso);

            assertNull(adSummerWithNoDstResult);

        }



        // Winter, known & correct DST state (DST == false)

        {

            String winterTimeNitzStringWithNoDst = winterTimeNitzString + ",0";

            NitzData nitzData = NitzData.parse(winterTimeNitzStringWithNoDst);

            int expectedUtcOffset = (int) TimeUnit.HOURS.toMillis(1);

            Integer expectedDstOffset = 0;

            assertEquals(expectedUtcOffset, nitzData.getLocalOffsetMillis());
@@ -252,10 +262,17 @@ public class TimeZoneLookupHelperTest { 
                    adWinterWithDstResult);

        }



        // Summer, unknown DST state

        // For historic reasons, GuessZoneIdByNitzCountry() does not handle unknown DST state - it

        // assumes that "unknown DST" means "no DST": This leads to no match when DST is actually in

        // force.

        // Winter, known & incorrect DST state (DST == true)

        {

            String winterTimeNitzStringWithDst = winterTimeNitzString + ",1";

            NitzData nitzData = NitzData.parse(winterTimeNitzStringWithDst);



            OffsetResult adWinterWithDstResult =

                    mTimeZoneLookupHelper.lookupByNitzCountry(nitzData, adIso);

            assertNull(adWinterWithDstResult);

        }



        // Summer, unknown DST state (will match any DST state with the correct offset).

        {

            NitzData nitzData = NitzData.parse(summerTimeNitzString);

            int expectedUtcOffset = (int) TimeUnit.HOURS.toMillis(2);
@@ -265,10 +282,14 @@ public class TimeZoneLookupHelperTest { 


            OffsetResult adSummerUnknownDstResult =

                    mTimeZoneLookupHelper.lookupByNitzCountry(nitzData, adIso);

            assertNull(adSummerUnknownDstResult);

            OffsetResult expectedResult =

                    new OffsetResult(zone("Europe/Andorra"), true /* isOnlyMatch */);

            assertEquals(expectedResult, adSummerUnknownDstResult);

            assertOffsetResultZoneOffsets(nhSummerTimeMillis, expectedUtcOffset, expectedDstOffset,

                    adSummerUnknownDstResult);

        }



        // Winter, unknown DST state

        // Winter, unknown DST state (will match any DST state with the correct offset)

        {

            NitzData nitzData = NitzData.parse(winterTimeNitzString);

            int expectedUtcOffset = (int) TimeUnit.HOURS.toMillis(1);