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

Merge "Tidy up libcore.timezone APIs" am: 45834d96a8

Browse Source 
Change-Id: I3222600a7fa1d37b7d8e16115ec067d415f2bdba
This commit is contained in:
Automerger Merge Worker
2020-01-31 16:29:11 +00:00
parent 49cd1555f3 45834d96a8
commit 35ffa52384
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;
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);
}