commit 37a8d6ec62060fc351ddaae7dacace3e6477bd5f
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 03 13:54:34 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 03 13:54:34 2021 +0000
tree bf444c27c7f04edf334b1fbdd456cb72671be683
parent d078d9dbb88f4aca7202a4893dacddc9cc6ebcd3
parent e049eb666ace4ddde9fea9e38b0922a68a31e826

Merge "Remove createZoneInfo() method"

android_icu4j/api/intra/current.txt

diff --git a/android_icu4j/api/intra/current.txt b/android_icu4j/api/intra/current.txt
index c8fe976..8ade871 100644
--- a/android_icu4j/api/intra/current.txt
+++ b/android_icu4j/api/intra/current.txt
@@ -79,7 +79,6 @@
     method @NonNull public com.android.i18n.timezone.ZoneInfoData createCopyWithRawOffset(int);
     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 static com.android.i18n.timezone.ZoneInfoData createZoneInfo(@NonNull String, @NonNull java.nio.ByteBuffer) throws java.io.IOException;
     method @NonNull public String getID();
     method @Nullable public Integer getLatestDstSavings(long);
     method public int getOffset(long);

android_icu4j/libcore_bridge/src/java/com/android/i18n/timezone/ZoneInfoData.java

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 5d195cc..68da9af 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
@@ -824,18 +824,6 @@
     }
 
     /**
-     * IntraCoreApi made visible for testing in libcore
-     *
-     * @hide
-     */
-    @libcore.api.IntraCoreApi
-    public static @NonNull ZoneInfoData createZoneInfo(@NonNull String name,
-            @NonNull ByteBuffer buf) throws IOException {
-        ByteBufferIterator bufferIterator = new ByteBufferIterator(buf);
-        return ZoneInfoData.readTimeZone("TimeZone for '" + name + "'", bufferIterator);
-    }
-
-    /**
      * Creates an instance. This method is only for testing purposes.
      *
      * @param transitions The times (in seconds) since beginning of the Unix epoch at which