Merge "Add empty incompatibilities baseline files."
diff --git a/android_icu4j/api/intra/current.txt b/android_icu4j/api/intra/current.txt
index 3852062..d3cc4cc 100644
--- a/android_icu4j/api/intra/current.txt
+++ b/android_icu4j/api/intra/current.txt
@@ -19,7 +19,7 @@
method @NonNull public static com.android.i18n.timezone.ZoneInfoData createFromSerializationFields(@NonNull String, @NonNull java.io.ObjectInputStream.GetField) throws java.io.IOException;
method @NonNull public static com.android.i18n.timezone.ZoneInfoData createInstance(@NonNull String, @NonNull long[], @NonNull byte[], @NonNull int[], @NonNull boolean[]);
method @NonNull public String getID();
- method @Nullable public Integer getLatestDstSavings(long);
+ method @Nullable public Integer getLatestDstSavingsMillis(long);
method public int getOffset(long);
method public int getOffsetsByUtcTime(long, @NonNull int[]);
method public int getRawOffset();
diff --git a/android_icu4j/libcore_bridge/src/java/com/android/i18n/timezone/ZoneInfoData.java b/android_icu4j/libcore_bridge/src/java/com/android/i18n/timezone/ZoneInfoData.java
index 68da9af..92c0c43 100644
--- a/android_icu4j/libcore_bridge/src/java/com/android/i18n/timezone/ZoneInfoData.java
+++ b/android_icu4j/libcore_bridge/src/java/com/android/i18n/timezone/ZoneInfoData.java
@@ -682,7 +682,7 @@
* @hide
*/
@libcore.api.IntraCoreApi
- public @Nullable Integer getLatestDstSavings(long when) {
+ public @Nullable Integer getLatestDstSavingsMillis(long when) {
// Find the latest daylight and standard offsets (if any).
int lastStdTransitionIndex = -1;
int lastDstTransitionIndex = -1;
diff --git a/android_icu4j/testing/src/com/android/i18n/test/timezone/ZoneInfoDataTest.java b/android_icu4j/testing/src/com/android/i18n/test/timezone/ZoneInfoDataTest.java
index 29a5d28..179b799 100644
--- a/android_icu4j/testing/src/com/android/i18n/test/timezone/ZoneInfoDataTest.java
+++ b/android_icu4j/testing/src/com/android/i18n/test/timezone/ZoneInfoDataTest.java
@@ -498,7 +498,7 @@
assertNotNull("TimeZone " + id + " was not created", zoneInfoData);
assertEquals(id, zoneInfoData.getID());
// Make sure that getLatestDstSavings() at the earliest possible time does not crash.
- zoneInfoData.getLatestDstSavings(Long.MIN_VALUE);
+ zoneInfoData.getLatestDstSavingsMillis(Long.MIN_VALUE);
}
}
@@ -663,13 +663,14 @@
}
private static void assertNoDSTSavings(ZoneInfoData zoneInfoData, Instant time) {
- assertNull(zoneInfoData.getLatestDstSavings(time.toEpochMilli()));
+ assertNull(zoneInfoData.getLatestDstSavingsMillis(time.toEpochMilli()));
}
private static void assertDSTSavings(ZoneInfoData zoneInfoData, Duration expectedDSTSavings,
Instant time) {
Integer expectedLatestDstSavings = (int) expectedDSTSavings.toMillis();
- assertEquals(expectedLatestDstSavings, zoneInfoData.getLatestDstSavings(time.toEpochMilli()));
+ assertEquals(expectedLatestDstSavings,
+ zoneInfoData.getLatestDstSavingsMillis(time.toEpochMilli()));
}
private static void assertInDaylightTime(ZoneInfoData zoneInfoData, Instant time,
diff --git a/build/icu.go b/build/icu.go
index 7887684..d269a5e 100644
--- a/build/icu.go
+++ b/build/icu.go
@@ -20,20 +20,16 @@
func init() {
host_allowlist := []string{
- "art/build/apex/",
"device/google/cuttlefish/host/commands/",
"external/skia",
"frameworks/base/libs/hwui",
- "libcore/",
"packages/modules/RuntimeI18n/apex/",
}
device_allowlist := []string{
- "art/",
"external/chromium-libpac",
"external/icu/",
"external/v8/",
- "libcore/",
"packages/modules/RuntimeI18n/",
// TODO(b/155921753): Restrict this when prebuilts are in their proper
// locations.