commit 3424f9a96374e32b77dbd77047ebd47dce88eb77
author Neil Fuller <nfuller@google.com> Thu Jan 30 11:25:35 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 30 11:25:35 2020 +0000
tree f3f6c06f1d57285faa606269311c7233a872338f
parent 9f1891018bf666182f04b29f14f18e1db44b16e2
parent e65736d4df1e07033f0544ee51273acb9b81dc59

Merge "Tidy up libcore.timezone APIs"

tests/CarDeveloperOptions/src/com/android/car/developeroptions/datetime/timezone/model/FilteredCountryTimeZones.java

diff --git a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/datetime/timezone/model/FilteredCountryTimeZones.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/datetime/timezone/model/FilteredCountryTimeZones.java
index b8a56c6..48f7ab3 100644
--- a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/datetime/timezone/model/FilteredCountryTimeZones.java
+++ b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/datetime/timezone/model/FilteredCountryTimeZones.java
@@ -48,9 +48,10 @@
         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);
     }