Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Simplify APIs exposed for time zone lookups" am: 19de70814a am: fbf9b6c05a

Browse Source 
am: 80bd973c3b

Change-Id: I57fa3e93d6c1d194842075fadca945089a4264e1
This commit is contained in:
Neil Fuller
2019-09-02 07:42:34 -07:00
committed by android-build-merger
parent 9b1711dde0 80bd973c3b
commit 4082aa586b
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java
View File

@@ -34,11 +34,14 @@ import androidx.core.text.TextDirectionHeuristicsCompat;
import com.android.settingslib.R; import com.android.settingslib.R;
import libcore.timezone.CountryTimeZones;
import libcore.timezone.CountryTimeZones.TimeZoneMapping;
import libcore.timezone.TimeZoneFinder; import libcore.timezone.TimeZoneFinder;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@@ -387,7 +390,21 @@ public class ZoneGetter {
@VisibleForTesting @VisibleForTesting
public List<String> lookupTimeZoneIdsByCountry(String country) { public List<String> lookupTimeZoneIdsByCountry(String country) {
return TimeZoneFinder.getInstance().lookupTimeZoneIdsByCountry(country); final CountryTimeZones countryTimeZones =
TimeZoneFinder.getInstance().lookupCountryTimeZones(country);
if (countryTimeZones == null) {
return null;
}
final List<TimeZoneMapping> mappings = countryTimeZones.getTimeZoneMappings();
return extractTimeZoneIds(mappings);
}
private static List<String> extractTimeZoneIds(List<TimeZoneMapping> timeZoneMappings) {
final List<String> zoneIds = new ArrayList<>(timeZoneMappings.size());
for (TimeZoneMapping timeZoneMapping : timeZoneMappings) {
zoneIds.add(timeZoneMapping.timeZoneId);
}
return Collections.unmodifiableList(zoneIds);
} }
} }
} }