Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cc722bd authored by Neil Fuller's avatar Neil Fuller
Browse files

Remove libcore.icu.TimeZoneNames.forLocale usage 

Remove usage of libcore.icu.TimeZoneNames.forLocale(Locale)
so it can be removed. This is the last user. Instead, an
equivalent method is used from the TimeZoneFinder class.

Bug: 36971201
Test: Build, boot, manual use of time zone settings picker.
Change-Id: I2645974f404c08aaecf13476ca022d07535f9b96
parent a34524e7

packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java

+4 −4
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import java.util.Locale; 
import java.util.Map;

import java.util.Set;

import java.util.TimeZone;

import libcore.util.TimeZoneFinder;



/**

 * ZoneGetter is the utility class to get time zone and zone list, and both of them have display
@@ -376,10 +377,9 @@ public class ZoneGetter { 
            }



            // Create a lookup of local zone IDs.

            localZoneIds = new HashSet<String>();

            for (String olsonId : libcore.icu.TimeZoneNames.forLocale(locale)) {

                localZoneIds.add(olsonId);

            }

            List<String> zoneIds =

                    TimeZoneFinder.getInstance().lookupTimeZoneIdsByCountry(locale.getCountry());

            localZoneIds = new HashSet<>(zoneIds);

        }

    }

}