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

Commit 81c2d33c authored by Kurt Marcinkiewicz's avatar Kurt Marcinkiewicz
Browse files

Fix NPE when country is absent from user's locale 

Bug: 110189628
Test: atest SettingsLibTests
Change-Id: If5f84ccc124ecd6dc6c2c125ca9d2cc1676217d9
parent 8e6710d7

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