Merge "Track changes in libcore" into pi-dev
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
index 4a624b7..0359cfc 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
@@ -73,13 +73,13 @@
CountryTimeZones US = mock(CountryTimeZones.class);
when(US.getCountryIso()).thenReturn("us");
when(US.getTimeZoneMappings()).thenReturn(Arrays.asList(
- TimeZoneMapping.createForTests("Unknown/Secret_City", true),
- TimeZoneMapping.createForTests("Unknown/Secret_City2", false)
+ TimeZoneMapping.createForTests("Unknown/Secret_City", true, null /* notUsedAfter */),
+ TimeZoneMapping.createForTests("Unknown/Secret_City2", false, null /* notUsedAfter */)
));
CountryTimeZones GB = mock(CountryTimeZones.class);
when(GB.getCountryIso()).thenReturn("gb");
when(GB.getTimeZoneMappings()).thenReturn(Collections.singletonList(
- TimeZoneMapping.createForTests("Unknown/Secret_City", true)
+ TimeZoneMapping.createForTests("Unknown/Secret_City", true, null /* notUsedAfter */)
));
when(mCountryZonesFinder.lookupCountryTimeZonesForZoneId("Unknown/Secret_City"))
.thenReturn(Arrays.asList(US, GB));