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

Commit 9fb141c3 authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

Merge "API changes for Locale to OpenJDK8u60 (part 1/2)" am: 01614e4e am:... 

Merge "API changes for Locale to OpenJDK8u60 (part 1/2)" am: 01614e4e am: abc432fd am: 19e46f91
am: 041bb951

Change-Id: I3804fa96bf222f0931c04dd8f0de1487e4f3358b
parents 8eeb8175 041bb951

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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;

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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;

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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;