diff options
| author | vichang <vichang@google.com> | 2021-01-11 10:31:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-01-11 10:31:07 +0000 |
| commit | cc5ee565bc550174975ecce29e887f8fdaee5e97 (patch) | |
| tree | c709637da0313d70979d8d98538600ca7f61ae06 /android_icu4j | |
| parent | 382a37ee350a0dceb28f45ff4f9836b8acacf10b (diff) | |
| parent | d21c122e9514d28c3636cae61ac0cd82956e630d (diff) | |
| download | icu-cc5ee565bc550174975ecce29e887f8fdaee5e97.tar.gz | |
Merge "Remove TimeZone#setICUDefault(TimeZone) from @IntraCoreApi"
Diffstat (limited to 'android_icu4j')
| -rw-r--r-- | android_icu4j/api/intra/current.txt | 4 | ||||
| -rw-r--r-- | android_icu4j/src/main/java/android/icu/util/TimeZone.java | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/android_icu4j/api/intra/current.txt b/android_icu4j/api/intra/current.txt index ea91a8b12..de09733cd 100644 --- a/android_icu4j/api/intra/current.txt +++ b/android_icu4j/api/intra/current.txt @@ -51,10 +51,6 @@ package android.icu.util { public class InitialTimeZoneRule extends android.icu.util.TimeZoneRule { } - public abstract class TimeZone implements java.lang.Cloneable android.icu.util.Freezable<android.icu.util.TimeZone> java.io.Serializable { - method @Deprecated public static void setICUDefault(android.icu.util.TimeZone); - } - public abstract class TimeZoneRule implements java.io.Serializable { method public int getDSTSavings(); method public int getRawOffset(); diff --git a/android_icu4j/src/main/java/android/icu/util/TimeZone.java b/android_icu4j/src/main/java/android/icu/util/TimeZone.java index a8b86e9e7..8a7939ca8 100644 --- a/android_icu4j/src/main/java/android/icu/util/TimeZone.java +++ b/android_icu4j/src/main/java/android/icu/util/TimeZone.java @@ -928,7 +928,6 @@ abstract public class TimeZone implements Serializable, Cloneable, Freezable<Tim * @deprecated This API is ICU internal only. * @hide draft / provisional / internal are hidden on Android */ - @libcore.api.IntraCoreApi @Deprecated public static synchronized void setICUDefault(TimeZone tz) { if (tz == null) { |