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

Simplify APIs exposed for time zone lookups

Browse Source 
The libcore.timezone APIs may form the basis for some
new SystemApis. Before starting that process the API
surface is being rationalized to establish the core
use cases.

Test: Treehugger
Bug: 139091367
Change-Id: Ib615976fae76ceb98873a33e1e995542e691c9d0
Merged-In: Ib615976fae76ceb98873a33e1e995542e691c9d0
(cherry picked from commit babab5cd6a)
This commit is contained in:
Neil Fuller
2019-08-19 20:27:45 +01:00
parent df2293f68b
commit e5700a7c49
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

@@ -33,11 +33,14 @@ import android.view.View;
import com.android.settingslib.R;
import libcore.timezone.CountryTimeZones;
import libcore.timezone.CountryTimeZones.TimeZoneMapping;
import libcore.timezone.TimeZoneFinder;
import org.xmlpull.v1.XmlPullParserException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -386,7 +389,21 @@ public class ZoneGetter {
@VisibleForTesting
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);
}
}
}