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

Commit df88e0d4 authored by Kurt Marcinkiewicz's avatar Kurt Marcinkiewicz Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when country is absent from user's locale"

parents 2eb94adb 81c2d33c

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

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ public class ZoneGetter { 


            // Create a lookup of local zone IDs.

            final List<String> zoneIds = lookupTimeZoneIdsByCountry(locale.getCountry());

            localZoneIds = new HashSet<>(zoneIds);

            localZoneIds = zoneIds != null ? new HashSet<>(zoneIds) : new HashSet<>();

        }



        @VisibleForTesting