Merge "Correct annotations in ZoneInfoDb" am: 55a61d2f61
Original change: https://android-review.googlesource.com/c/platform/external/icu/+/1486181
Change-Id: Icf30ea789b91e4e0d9e2c808cf641056ab716333
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 bc12bec..1e306ab 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
@@ -35,7 +35,6 @@
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.TimeZone;
-import libcore.api.IntraCoreApi;
/**
* Our concrete TimeZone implementation, backed by zoneinfo data.
@@ -78,7 +77,7 @@
/**
* The serialized fields in {@link libcore.util.ZoneInfo} kept for backward app compatibility.
*/
- @IntraCoreApi
+ @libcore.api.IntraCoreApi
public static final ObjectStreamField[] ZONEINFO_SERIALIZED_FIELDS = new ObjectStreamField[] {
new ObjectStreamField("mRawOffset", int.class),
new ObjectStreamField("mEarliestRawOffset", int.class),
@@ -216,7 +215,7 @@
/**
* Copy constructor
*/
- @IntraCoreApi
+ @libcore.api.IntraCoreApi
public ZoneInfoData(ZoneInfoData that) {
if (that == null) {
throw new NullPointerException("ZoneInfoData can't be null");
diff --git a/android_icu4j/libcore_bridge/src/java/com/android/i18n/timezone/ZoneInfoDb.java b/android_icu4j/libcore_bridge/src/java/com/android/i18n/timezone/ZoneInfoDb.java
index cac8469..3e651bd 100644
--- a/android_icu4j/libcore_bridge/src/java/com/android/i18n/timezone/ZoneInfoDb.java
+++ b/android_icu4j/libcore_bridge/src/java/com/android/i18n/timezone/ZoneInfoDb.java
@@ -297,7 +297,6 @@
}
}
- @libcore.api.IntraCoreApi
ZoneInfoData makeZoneInfoDataUncached(String id) throws IOException {
BufferIterator it = getBufferIterator(id);
if (it == null) {
@@ -367,6 +366,7 @@
return cache.get(id) != null;
}
+ @Override
public void close() {
if (!closed) {
closed = true;