commit 18248510ef6bdb4f634ca420aef91662987bcfc3
author Neil Fuller <nfuller@google.com> Thu May 25 10:39:14 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 25 10:39:15 2017 +0000
tree d06ac762d3711ab1bb0f988aa71a9d4a17aed5ca
parent faceae742b64b346e3753e75c52780c46c14e0cb
parent 0219341c06c04ba7bde63d0d1b5b43bbd08bb4a4

Merge "Handle removal of time_zones_by_country.xml"

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 65b4322..d5f6997 100644
--- a/src/java/com/android/internal/telephony/ServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/ServiceStateTracker.java
@@ -2836,20 +2836,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");