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

Commit de86f9c9 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Tidy up libcore.timezone APIs" am: 45834d96 am: 35ffa523 am: 798407a4 

Change-Id: I486df8f44bcd67baf933853145f7617cf6b0e891
parents 04232f61 798407a4

src/com/android/settings/datetime/timezone/model/FilteredCountryTimeZones.java

+4 −3
Original line number Diff line number Diff line
@@ -48,9 +48,10 @@ public class FilteredCountryTimeZones { 
        mCountryTimeZones = countryTimeZones;

        List<String> timeZoneIds = countryTimeZones.getTimeZoneMappings().stream()

                .filter(timeZoneMapping ->

                        timeZoneMapping.showInPicker && (timeZoneMapping.notUsedAfter == null

                                || timeZoneMapping.notUsedAfter >= MIN_USE_DATE_OF_TIMEZONE))

                .map(timeZoneMapping -> timeZoneMapping.timeZoneId)

                        timeZoneMapping.isShownInPicker()

                                && (timeZoneMapping.getNotUsedAfter() == null

                                || timeZoneMapping.getNotUsedAfter() >= MIN_USE_DATE_OF_TIMEZONE))

                .map(timeZoneMapping -> timeZoneMapping.getTimeZoneId())

                .collect(Collectors.toList());

        mTimeZoneIds = Collections.unmodifiableList(timeZoneIds);

    }