Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79ebcde0 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Hide static setDefault methods in ICU4J" 

am: 9e892f53

* commit '9e892f53':
  Hide static setDefault methods in ICU4J
parents 7191a775 9e892f53

api/current.txt

+0 −7
Original line number Diff line number Diff line
@@ -18019,7 +18019,6 @@ package android.icu.util { 
    method public static java.lang.String getCanonicalID(java.lang.String, boolean[]);

    method public int getDSTSavings();

    method public static android.icu.util.TimeZone getDefault();

    method public static int getDefaultTimeZoneType();

    method public final java.lang.String getDisplayName();

    method public final java.lang.String getDisplayName(java.util.Locale);

    method public final java.lang.String getDisplayName(android.icu.util.ULocale);
@@ -18043,8 +18042,6 @@ package android.icu.util { 
    method public abstract boolean inDaylightTime(java.util.Date);

    method public boolean isFrozen();

    method public boolean observesDaylightTime();

    method public static synchronized void setDefault(android.icu.util.TimeZone);

    method public static synchronized void setDefaultTimeZoneType(int);

    method public void setID(java.lang.String);

    method public abstract void setRawOffset(int);

    method public abstract boolean useDaylightTime();
@@ -18057,8 +18054,6 @@ package android.icu.util { 
    field public static final int SHORT_COMMONLY_USED = 6; // 0x6

    field public static final int SHORT_GENERIC = 2; // 0x2

    field public static final int SHORT_GMT = 4; // 0x4

    field public static final int TIMEZONE_ICU = 0; // 0x0

    field public static final int TIMEZONE_JDK = 1; // 0x1

    field public static final android.icu.util.TimeZone UNKNOWN_ZONE;

    field public static final java.lang.String UNKNOWN_ZONE_ID = "Etc/Unknown";

  }
@@ -18154,8 +18149,6 @@ package android.icu.util { 
    method public static java.lang.String getVariant(java.lang.String);

    method public boolean isRightToLeft();

    method public static android.icu.util.ULocale minimizeSubtags(android.icu.util.ULocale);

    method public static synchronized void setDefault(android.icu.util.ULocale);

    method public static synchronized void setDefault(android.icu.util.ULocale.Category, android.icu.util.ULocale);

    method public android.icu.util.ULocale setKeywordValue(java.lang.String, java.lang.String);

    method public static java.lang.String setKeywordValue(java.lang.String, java.lang.String, java.lang.String);

    method public java.lang.String toLanguageTag();

api/system-current.txt

+0 −7
Original line number Diff line number Diff line
@@ -18968,7 +18968,6 @@ package android.icu.util { 
    method public static java.lang.String getCanonicalID(java.lang.String, boolean[]);

    method public int getDSTSavings();

    method public static android.icu.util.TimeZone getDefault();

    method public static int getDefaultTimeZoneType();

    method public final java.lang.String getDisplayName();

    method public final java.lang.String getDisplayName(java.util.Locale);

    method public final java.lang.String getDisplayName(android.icu.util.ULocale);
@@ -18992,8 +18991,6 @@ package android.icu.util { 
    method public abstract boolean inDaylightTime(java.util.Date);

    method public boolean isFrozen();

    method public boolean observesDaylightTime();

    method public static synchronized void setDefault(android.icu.util.TimeZone);

    method public static synchronized void setDefaultTimeZoneType(int);

    method public void setID(java.lang.String);

    method public abstract void setRawOffset(int);

    method public abstract boolean useDaylightTime();
@@ -19006,8 +19003,6 @@ package android.icu.util { 
    field public static final int SHORT_COMMONLY_USED = 6; // 0x6

    field public static final int SHORT_GENERIC = 2; // 0x2

    field public static final int SHORT_GMT = 4; // 0x4

    field public static final int TIMEZONE_ICU = 0; // 0x0

    field public static final int TIMEZONE_JDK = 1; // 0x1

    field public static final android.icu.util.TimeZone UNKNOWN_ZONE;

    field public static final java.lang.String UNKNOWN_ZONE_ID = "Etc/Unknown";

  }
@@ -19103,8 +19098,6 @@ package android.icu.util { 
    method public static java.lang.String getVariant(java.lang.String);

    method public boolean isRightToLeft();

    method public static android.icu.util.ULocale minimizeSubtags(android.icu.util.ULocale);

    method public static synchronized void setDefault(android.icu.util.ULocale);

    method public static synchronized void setDefault(android.icu.util.ULocale.Category, android.icu.util.ULocale);

    method public android.icu.util.ULocale setKeywordValue(java.lang.String, java.lang.String);

    method public static java.lang.String setKeywordValue(java.lang.String, java.lang.String, java.lang.String);

    method public java.lang.String toLanguageTag();