Update language in system/timezone to comply with Android’s inclusive language guidance am: fdc5399eb1 am: 6ac9af6f5a am: f4f075df71 am: 03594ae287
Original change: https://android-review.googlesource.com/c/platform/system/timezone/+/1372805
Change-Id: Ib16cd0b533876b8efd343471c04fde499fc941dd
diff --git a/apex/tests/src/java/android/tzdata/mts/TimeZoneRulesTest.java b/apex/tests/src/java/android/tzdata/mts/TimeZoneRulesTest.java
index 0fe9f1d..96c91d3 100644
--- a/apex/tests/src/java/android/tzdata/mts/TimeZoneRulesTest.java
+++ b/apex/tests/src/java/android/tzdata/mts/TimeZoneRulesTest.java
@@ -144,7 +144,7 @@
}
}
- // Sanity check that whenever a display name is just a GMT string that it's the
+ // Confidence check that whenever a display name is just a GMT string that it's the
// right GMT string.
String gmtDst = formatGmtString(tz, true);
String gmtStd = formatGmtString(tz, false);
diff --git a/input_tools/android/tzlookup_generator/src/main/java/com/android/libcore/timezone/tzlookup/TzLookupGenerator.java b/input_tools/android/tzlookup_generator/src/main/java/com/android/libcore/timezone/tzlookup/TzLookupGenerator.java
index 119d847..75fef71 100644
--- a/input_tools/android/tzlookup_generator/src/main/java/com/android/libcore/timezone/tzlookup/TzLookupGenerator.java
+++ b/input_tools/android/tzlookup_generator/src/main/java/com/android/libcore/timezone/tzlookup/TzLookupGenerator.java
@@ -122,13 +122,13 @@
List<CountryZonesFile.Country> countriesIn = countryZonesIn.getCountriesList();
List<String> countriesInIsos = CountryZonesFileSupport.extractIsoCodes(countriesIn);
- // Sanity check the countryzones file only contains lower-case country codes. The output
- // file uses them and the on-device code assumes lower case.
+ // Confidence check the countryzones file only contains lower-case country codes. The
+ // output file uses them and the on-device code assumes lower case.
if (!Utils.allLowerCaseAscii(countriesInIsos)) {
throw errors.addFatalAndHalt(
"Non-lowercase country ISO codes found in: " + countriesInIsos);
}
- // Sanity check the countryzones file doesn't contain duplicate country entries.
+ // Confidence check the countryzones file doesn't contain duplicate country entries.
if (!Utils.allUnique(countriesInIsos)) {
throw errors.addFatalAndHalt(
"Duplicate input country entries found: " + countriesInIsos);
diff --git a/input_tools/android/zone_compactor/main/java/ZoneCompactor.java b/input_tools/android/zone_compactor/main/java/ZoneCompactor.java
index 72e5e0c..5cc076a 100644
--- a/input_tools/android/zone_compactor/main/java/ZoneCompactor.java
+++ b/input_tools/android/zone_compactor/main/java/ZoneCompactor.java
@@ -125,7 +125,7 @@
// tzdata_version
f.write(toAscii(new byte[12], version));
- // Write dummy values for the offsets, and remember where we need to seek back to later
+ // Write placeholder values for the offsets, and remember where we need to seek back to later
// when we have the real values.
int index_offset_offset = (int) f.getFilePointer();
f.writeInt(0);