commit 0219341c06c04ba7bde63d0d1b5b43bbd08bb4a4
author Neil Fuller <nfuller@google.com> Fri Mar 31 13:31:08 2017 +0100
committer Neil Fuller <nfuller@google.com> Fri Apr 28 17:25:57 2017 +0100
tree f04bd47b268428d041c9bb2cfc9e600d3908a60a
parent b5f5e96e0176d3d808fc89687d3fc385b8c29de0

Handle removal of time_zones_by_country.xml

The time_zones_by_country.xml file has been replaced
by a file that can be updated outside of an OTA and
can be accessed via libcore.util.TimeZoneFinder.

This change includes refactorings that result
and keeps this code from using ICU types to avoid
confusion.

Bug: 25338903
Test: Ran CtsUtilTestCases
Change-Id: I699b4e7420e8d7e61ee68ec96552ab3144c9bab2

src/java/com/android/internal/telephony/ServiceStateTracker.java

diff --git a/src/java/com/android/internal/telephony/ServiceStateTracker.java b/src/java/com/android/internal/telephony/ServiceStateTracker.java
index ac7c446..4e27e3a 100644
--- a/src/java/com/android/internal/telephony/ServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/ServiceStateTracker.java
@@ -2818,20 +2818,20 @@
                             TelephonyProperties.PROPERTY_IGNORE_NITZ, false)
                             && ((SystemClock.uptimeMillis() & 1) == 0);
 
-                    ArrayList<TimeZone> uniqueZones = TimeUtils.getTimeZonesWithUniqueOffsets(iso);
-                    if ((uniqueZones.size() == 1) || testOneUniqueOffsetPath) {
-                        TimeZone zone = uniqueZones.get(0);
+                    List<String> uniqueZoneIds = TimeUtils.getTimeZoneIdsWithUniqueOffsets(iso);
+                    if ((uniqueZoneIds.size() == 1) || testOneUniqueOffsetPath) {
+                        String zoneId = uniqueZoneIds.get(0);
                         if (DBG) {
                             log("pollStateDone: no nitz but one TZ for iso-cc=" + iso
-                                    + " with zone.getID=" + zone.getID()
+                                    + " with zone.getID=" + zoneId
                                     + " testOneUniqueOffsetPath=" + testOneUniqueOffsetPath);
                         }
-                        mTimeZoneLog.log("pollStateDone: set time zone=" + zone.getID()
+                        mTimeZoneLog.log("pollStateDone: set time zone=" + zoneId
                                 + " mcc=" + mcc + " iso=" + iso);
-                        setAndBroadcastNetworkSetTimeZone(zone.getID());
+                        setAndBroadcastNetworkSetTimeZone(zoneId);
                     } else {
                         if (DBG) {
-                            log("pollStateDone: there are " + uniqueZones.size()
+                            log("pollStateDone: there are " + uniqueZoneIds.size()
                                     + " unique offsets for iso-cc='" + iso
                                     + " testOneUniqueOffsetPath=" + testOneUniqueOffsetPath
                                     + "', do nothing");