diff options
| author | 2016-10-03 13:57:22 +0000 | |
|---|---|---|
| committer | 2016-10-03 13:57:22 +0000 | |
| commit | 19e46f91faaaa8df007c9304ac2206e4df1e7c7e (patch) | |
| tree | ac342d4e49ca9fd3da5b1142c86158aa55fe8e16 | |
| parent | f9fd4c01f39234be74c549abdf0131fb8102235b (diff) | |
| parent | abc432fd0926ae7c1e27e7936769c3417bc98ec9 (diff) | |
Merge "API changes for Locale to OpenJDK8u60 (part 1/2)" am: 01614e4e7f
am: abc432fd09
Change-Id: Iebccf0f8b271649596066807f0a59f5fefb3ee94
| -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 a1e833724f15..b391b00458a5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -59117,8 +59117,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 0787091fb771..68c7b486022e 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -62474,8 +62474,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 d8936b675c6c..2aa6cfe7e52f 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -59197,8 +59197,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; |