Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 7de23e292f

Change-Id: Id25c5050bb798ec206e86a83260a3bee9510e52c
This commit is contained in:
Tobias Thierer
2016-12-13 13:48:39 +00:00
committed by android-build-merger
parent b2f7005f07 7de23e292f
commit cd6720274d
3 changed files with 84 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
api/current.txt
View File

@@ -59296,6 +59296,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();
@@ -59324,6 +59328,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();
@@ -59379,6 +59385,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);

28
api/system-current.txt
View File

@@ -62857,6 +62857,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();
@@ -62885,6 +62889,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();
@@ -62940,6 +62946,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);

28
api/test-current.txt
View File

@@ -59387,6 +59387,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();
@@ -59415,6 +59419,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();
@@ -59470,6 +59476,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);