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

Commit 041bb951 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: abc432fd 

am: 19e46f91

Change-Id: I55ae235e9f1aa0e1442549408206fb9dcc0b6d91
parents e60842ab 19e46f91

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -59306,8 +59306,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
@@ -62840,8 +62840,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
@@ -59397,8 +59397,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;