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

Commit abc432fd 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

Change-Id: Iaa1c3b284d4ff97799dd1939da34c088b95b7915
parents 12b48830 01614e4e

api/current.txt

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

api/system-current.txt

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

api/test-current.txt

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