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

Commit 29b639c0 authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

Merge "API changes for updating Locale to OpenJDK8u60, part 2" am: c35137ce... 

Merge "API changes for updating Locale to OpenJDK8u60, part 2" am: c35137ce am: 7de23e29 am: cd672027
am: a5e12831

Change-Id: I482b047e387c34487a031a4bb71d05799e31e621
parents 52e64d01 a5e12831

api/current.txt

+28 −0
Original line number Diff line number Diff line
@@ -59912,6 +59912,10 @@ package java.util { 
    ctor public Locale(java.lang.String, java.lang.String);

    ctor public Locale(java.lang.String);

    method public java.lang.Object clone();

    method public static java.util.List<java.util.Locale> filter(java.util.List<java.util.Locale.LanguageRange>, java.util.Collection<java.util.Locale>, java.util.Locale.FilteringMode);

    method public static java.util.List<java.util.Locale> filter(java.util.List<java.util.Locale.LanguageRange>, java.util.Collection<java.util.Locale>);

    method public static java.util.List<java.lang.String> filterTags(java.util.List<java.util.Locale.LanguageRange>, java.util.Collection<java.lang.String>, java.util.Locale.FilteringMode);

    method public static java.util.List<java.lang.String> filterTags(java.util.List<java.util.Locale.LanguageRange>, java.util.Collection<java.lang.String>);

    method public static java.util.Locale forLanguageTag(java.lang.String);

    method public static java.util.Locale[] getAvailableLocales();

    method public java.lang.String getCountry();
@@ -59940,6 +59944,8 @@ package java.util { 
    method public java.lang.String getUnicodeLocaleType(java.lang.String);

    method public java.lang.String getVariant();

    method public boolean hasExtensions();

    method public static java.util.Locale lookup(java.util.List<java.util.Locale.LanguageRange>, java.util.Collection<java.util.Locale>);

    method public static java.lang.String lookupTag(java.util.List<java.util.Locale.LanguageRange>, java.util.Collection<java.lang.String>);

    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();
@@ -59995,6 +60001,28 @@ package java.util { 
    enum_constant public static final java.util.Locale.Category FORMAT;

  }













  public static final class Locale.FilteringMode extends java.lang.Enum {













    method public static java.util.Locale.FilteringMode valueOf(java.lang.String);













    method public static final java.util.Locale.FilteringMode[] values();













    enum_constant public static final java.util.Locale.FilteringMode AUTOSELECT_FILTERING;













    enum_constant public static final java.util.Locale.FilteringMode EXTENDED_FILTERING;













    enum_constant public static final java.util.Locale.FilteringMode IGNORE_EXTENDED_RANGES;













    enum_constant public static final java.util.Locale.FilteringMode MAP_EXTENDED_RANGES;













    enum_constant public static final java.util.Locale.FilteringMode REJECT_EXTENDED_RANGES;













  }

























  public static final class Locale.LanguageRange {













    ctor public Locale.LanguageRange(java.lang.String);













    ctor public Locale.LanguageRange(java.lang.String, double);













    method public java.lang.String getRange();













    method public double getWeight();













    method public static java.util.List<java.util.Locale.LanguageRange> mapEquivalents(java.util.List<java.util.Locale.LanguageRange>, java.util.Map<java.lang.String, java.util.List<java.lang.String>>);













    method public static java.util.List<java.util.Locale.LanguageRange> parse(java.lang.String);













    method public static java.util.List<java.util.Locale.LanguageRange> parse(java.lang.String, java.util.Map<java.lang.String, java.util.List<java.lang.String>>);













    field public static final double MAX_WEIGHT = 1.0;













    field public static final double MIN_WEIGHT = 0.0;













  }



























  public class LongSummaryStatistics implements java.util.function.IntConsumer java.util.function.LongConsumer {















    ctor public LongSummaryStatistics();















    method public void accept(int);

























api/system-current.txt



+28
−0




























Original line number
Diff line number
Diff line








@@ -63464,6 +63464,10 @@ package java.util {













    ctor public Locale(java.lang.String, java.lang.String);















    ctor public Locale(java.lang.String);















    method public java.lang.Object clone();













    method public static java.util.List<java.util.Locale> filter(java.util.List<java.util.Locale.LanguageRange>, java.util.Collection<java.util.Locale>, java.util.Locale.FilteringMode);













    method public static java.util.List<java.util.Locale> filter(java.util.List<java.util.Locale.LanguageRange>, java.util.Collection<java.util.Locale>);













    method public static java.util.List<java.lang.String> filterTags(java.util.List<java.util.Locale.LanguageRange>, java.util.Collection<java.lang.String>, java.util.Locale.FilteringMode);













    method public static java.util.List<java.lang.String> filterTags(java.util.List<java.util.Locale.LanguageRange>, java.util.Collection<java.lang.String>);















    method public static java.util.Locale forLanguageTag(java.lang.String);















    method public static java.util.Locale[] getAvailableLocales();















    method public java.lang.String getCountry();










@@ -63492,6 +63496,8 @@ package java.util {













    method public java.lang.String getUnicodeLocaleType(java.lang.String);















    method public java.lang.String getVariant();















    method public boolean hasExtensions();













    method public static java.util.Locale lookup(java.util.List<java.util.Locale.LanguageRange>, java.util.Collection<java.util.Locale>);













    method public static java.lang.String lookupTag(java.util.List<java.util.Locale.LanguageRange>, java.util.Collection<java.lang.String>);















    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();










@@ -63547,6 +63553,28 @@ package java.util {













    enum_constant public static final java.util.Locale.Category FORMAT;















  }



























  public static final class Locale.FilteringMode extends java.lang.Enum {













    method public static java.util.Locale.FilteringMode valueOf(java.lang.String);













    method public static final java.util.Locale.FilteringMode[] values();













    enum_constant public static final java.util.Locale.FilteringMode AUTOSELECT_FILTERING;













    enum_constant public static final java.util.Locale.FilteringMode EXTENDED_FILTERING;













    enum_constant public static final java.util.Locale.FilteringMode IGNORE_EXTENDED_RANGES;













    enum_constant public static final java.util.Locale.FilteringMode MAP_EXTENDED_RANGES;













    enum_constant public static final java.util.Locale.FilteringMode REJECT_EXTENDED_RANGES;













  }

























  public static final class Locale.LanguageRange {













    ctor public Locale.LanguageRange(java.lang.String);













    ctor public Locale.LanguageRange(java.lang.String, double);













    method public java.lang.String getRange();













    method public double getWeight();













    method public static java.util.List<java.util.Locale.LanguageRange> mapEquivalents(java.util.List<java.util.Locale.LanguageRange>, java.util.Map<java.lang.String, java.util.List<java.lang.String>>);













    method public static java.util.List<java.util.Locale.LanguageRange> parse(java.lang.String);













    method public static java.util.List<java.util.Locale.LanguageRange> parse(java.lang.String, java.util.Map<java.lang.String, java.util.List<java.lang.String>>);













    field public static final double MAX_WEIGHT = 1.0;













    field public static final double MIN_WEIGHT = 0.0;













  }



























  public class LongSummaryStatistics implements java.util.function.IntConsumer java.util.function.LongConsumer {















    ctor public LongSummaryStatistics();















    method public void accept(int);

























api/test-current.txt



+28
−0




























Original line number
Diff line number
Diff line








@@ -60201,6 +60201,10 @@ package java.util {













    ctor public Locale(java.lang.String, java.lang.String);















    ctor public Locale(java.lang.String);















    method public java.lang.Object clone();













    method public static java.util.List<java.util.Locale> filter(java.util.List<java.util.Locale.LanguageRange>, java.util.Collection<java.util.Locale>, java.util.Locale.FilteringMode);













    method public static java.util.List<java.util.Locale> filter(java.util.List<java.util.Locale.LanguageRange>, java.util.Collection<java.util.Locale>);













    method public static java.util.List<java.lang.String> filterTags(java.util.List<java.util.Locale.LanguageRange>, java.util.Collection<java.lang.String>, java.util.Locale.FilteringMode);













    method public static java.util.List<java.lang.String> filterTags(java.util.List<java.util.Locale.LanguageRange>, java.util.Collection<java.lang.String>);















    method public static java.util.Locale forLanguageTag(java.lang.String);















    method public static java.util.Locale[] getAvailableLocales();















    method public java.lang.String getCountry();










@@ -60229,6 +60233,8 @@ package java.util {













    method public java.lang.String getUnicodeLocaleType(java.lang.String);















    method public java.lang.String getVariant();















    method public boolean hasExtensions();













    method public static java.util.Locale lookup(java.util.List<java.util.Locale.LanguageRange>, java.util.Collection<java.util.Locale>);













    method public static java.lang.String lookupTag(java.util.List<java.util.Locale.LanguageRange>, java.util.Collection<java.lang.String>);















    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();










@@ -60284,6 +60290,28 @@ package java.util {













    enum_constant public static final java.util.Locale.Category FORMAT;















  }



























  public static final class Locale.FilteringMode extends java.lang.Enum {













    method public static java.util.Locale.FilteringMode valueOf(java.lang.String);













    method public static final java.util.Locale.FilteringMode[] values();













    enum_constant public static final java.util.Locale.FilteringMode AUTOSELECT_FILTERING;













    enum_constant public static final java.util.Locale.FilteringMode EXTENDED_FILTERING;













    enum_constant public static final java.util.Locale.FilteringMode IGNORE_EXTENDED_RANGES;













    enum_constant public static final java.util.Locale.FilteringMode MAP_EXTENDED_RANGES;













    enum_constant public static final java.util.Locale.FilteringMode REJECT_EXTENDED_RANGES;













  }

























  public static final class Locale.LanguageRange {













    ctor public Locale.LanguageRange(java.lang.String);













    ctor public Locale.LanguageRange(java.lang.String, double);













    method public java.lang.String getRange();













    method public double getWeight();













    method public static java.util.List<java.util.Locale.LanguageRange> mapEquivalents(java.util.List<java.util.Locale.LanguageRange>, java.util.Map<java.lang.String, java.util.List<java.lang.String>>);













    method public static java.util.List<java.util.Locale.LanguageRange> parse(java.lang.String);













    method public static java.util.List<java.util.Locale.LanguageRange> parse(java.lang.String, java.util.Map<java.lang.String, java.util.List<java.lang.String>>);













    field public static final double MAX_WEIGHT = 1.0;













    field public static final double MIN_WEIGHT = 0.0;













  }



























  public class LongSummaryStatistics implements java.util.function.IntConsumer java.util.function.LongConsumer {















    ctor public LongSummaryStatistics();















    method public void accept(int);