diff options
| author | 2016-10-03 14:12:00 +0000 | |
|---|---|---|
| committer | 2016-10-03 14:12:00 +0000 | |
| commit | 9fb141c333d4d3493c94e47b2057d0e254cfd748 (patch) | |
| tree | a90533d1d6a0c8462b1612174f35b1c1f14cface | |
| parent | 8eeb81750adbdc06916d68d8b9f301e694f5c7c1 (diff) | |
| parent | 041bb9513290af8d08f5bd2c7eef00dd7ad87342 (diff) | |
Merge "API changes for Locale to OpenJDK8u60 (part 1/2)" am: 01614e4e7f am: abc432fd09 am: 19e46f91fa
am: 041bb95132
Change-Id: I3804fa96bf222f0931c04dd8f0de1487e4f3358b
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | api/test-current.txt | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 3d116029ad17..10b09171241c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -59424,8 +59424,10 @@ package java.util { method public java.util.Set<java.lang.String> getUnicodeLocaleKeys(); method public java.lang.String getUnicodeLocaleType(java.lang.String); method public java.lang.String getVariant(); + method public boolean hasExtensions(); method public static synchronized void setDefault(java.util.Locale); method public static synchronized void setDefault(java.util.Locale.Category, java.util.Locale); + method public java.util.Locale stripExtensions(); method public java.lang.String toLanguageTag(); method public final java.lang.String toString(); field public static final java.util.Locale CANADA; diff --git a/api/system-current.txt b/api/system-current.txt index 1ab4884ed736..a6654caa223b 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -62961,8 +62961,10 @@ package java.util { method public java.util.Set<java.lang.String> getUnicodeLocaleKeys(); method public java.lang.String getUnicodeLocaleType(java.lang.String); method public java.lang.String getVariant(); + method public boolean hasExtensions(); method public static synchronized void setDefault(java.util.Locale); method public static synchronized void setDefault(java.util.Locale.Category, java.util.Locale); + method public java.util.Locale stripExtensions(); method public java.lang.String toLanguageTag(); method public final java.lang.String toString(); field public static final java.util.Locale CANADA; diff --git a/api/test-current.txt b/api/test-current.txt index 6d4590def9c3..684e364f5904 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -59526,8 +59526,10 @@ package java.util { method public java.util.Set<java.lang.String> getUnicodeLocaleKeys(); method public java.lang.String getUnicodeLocaleType(java.lang.String); method public java.lang.String getVariant(); + method public boolean hasExtensions(); method public static synchronized void setDefault(java.util.Locale); method public static synchronized void setDefault(java.util.Locale.Category, java.util.Locale); + method public java.util.Locale stripExtensions(); method public java.lang.String toLanguageTag(); method public final java.lang.String toString(); field public static final java.util.Locale CANADA; |