PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tidy up libcore.timezone APIs"

Browse Source
This commit is contained in:
Neil Fuller
2020-01-30 11:25:35 +00:00
committed by Gerrit Code Review
parent ef77c1d67f 7b54a31132
commit 45834d96a8
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/datetime/timezone/model/FilteredCountryTimeZones.java
View File

@@ -48,9 +48,10 @@ public class FilteredCountryTimeZones {
mCountryTimeZones = countryTimeZones; mCountryTimeZones = countryTimeZones;
List<String> timeZoneIds = countryTimeZones.getTimeZoneMappings().stream() List<String> timeZoneIds = countryTimeZones.getTimeZoneMappings().stream()
.filter(timeZoneMapping -> .filter(timeZoneMapping ->
timeZoneMapping.showInPicker && (timeZoneMapping.notUsedAfter == null timeZoneMapping.isShownInPicker()
|| timeZoneMapping.notUsedAfter >= MIN_USE_DATE_OF_TIMEZONE)) && (timeZoneMapping.getNotUsedAfter() == null
.map(timeZoneMapping -> timeZoneMapping.timeZoneId) || timeZoneMapping.getNotUsedAfter() >= MIN_USE_DATE_OF_TIMEZONE))
.map(timeZoneMapping -> timeZoneMapping.getTimeZoneId())
.collect(Collectors.toList()); .collect(Collectors.toList());
mTimeZoneIds = Collections.unmodifiableList(timeZoneIds); mTimeZoneIds = Collections.unmodifiableList(timeZoneIds);
} }