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

Commit 53414ee9 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Avoid a @Nullable Boolean" am: 8e28e556

Change-Id: I5ee11343c01e75991d45595aa9fdd73fccf52544
parents f3e9bdec 8e28e556
Loading
Loading
Loading
Loading
+12 −5
Original line number Diff line number Diff line
@@ -133,11 +133,18 @@ public class TimeZoneLookupHelper {
        // 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.
        if (dstAdjustmentMillis == null) {
            return countryTimeZones.lookupByOffsetWithBias(
                nitzData.getLocalOffsetMillis(), isDst, dstAdjustmentMillisToMatch,
                nitzData.getCurrentTimeInMillis(), bias);
                    nitzData.getCurrentTimeInMillis(), bias, nitzData.getLocalOffsetMillis());

        } else {
            // We don't try to match the exact DST offset given, we just use it to work out if
            // the country is in DST.
            boolean isDst = dstAdjustmentMillis != 0;
            return countryTimeZones.lookupByOffsetWithBias(
                    nitzData.getCurrentTimeInMillis(), bias,
                    nitzData.getLocalOffsetMillis(), isDst);
        }
    }

    /**