From 2f55bdf2e30e584ebb0b254738b4de76439ac1bb Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Tue, 8 Mar 2016 19:03:08 +0000 Subject: Track libcore change f121f31fd91c5a557225cd6a97418e716529eb2d (part 2) Bug: 27427010 Change-Id: I5527f34ef6bf15aaa1a39b705e951122ae4b3d5a --- api/current.txt | 16 ++++++++++++++++ api/system-current.txt | 16 ++++++++++++++++ api/test-current.txt | 16 ++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/api/current.txt b/api/current.txt index 22fd25deba4b..29fb03ecb3a0 100644 --- a/api/current.txt +++ b/api/current.txt @@ -57476,7 +57476,23 @@ package java.util { public abstract interface Comparator { method public abstract int compare(T, T); + method public static java.util.Comparator comparing(java.util.function.Function, java.util.Comparator); + method public static java.util.Comparator comparing(java.util.function.Function); + method public static java.util.Comparator comparingDouble(java.util.function.ToDoubleFunction); + method public static java.util.Comparator comparingInt(java.util.function.ToIntFunction); + method public static java.util.Comparator comparingLong(java.util.function.ToLongFunction); method public abstract boolean equals(java.lang.Object); + method public static java.util.Comparator naturalOrder(); + method public static java.util.Comparator nullsFirst(java.util.Comparator); + method public static java.util.Comparator nullsLast(java.util.Comparator); + method public static java.util.Comparator reverseOrder(); + method public default java.util.Comparator reversed(); + method public default java.util.Comparator thenComparing(java.util.Comparator); + method public default java.util.Comparator thenComparing(java.util.function.Function, java.util.Comparator); + method public default java.util.Comparator thenComparing(java.util.function.Function); + method public default java.util.Comparator thenComparingDouble(java.util.function.ToDoubleFunction); + method public default java.util.Comparator thenComparingInt(java.util.function.ToIntFunction); + method public default java.util.Comparator thenComparingLong(java.util.function.ToLongFunction); } public class ConcurrentModificationException extends java.lang.RuntimeException { diff --git a/api/system-current.txt b/api/system-current.txt index 97af1a676695..f92ddb9d5d3d 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -60579,7 +60579,23 @@ package java.util { public abstract interface Comparator { method public abstract int compare(T, T); + method public static java.util.Comparator comparing(java.util.function.Function, java.util.Comparator); + method public static java.util.Comparator comparing(java.util.function.Function); + method public static java.util.Comparator comparingDouble(java.util.function.ToDoubleFunction); + method public static java.util.Comparator comparingInt(java.util.function.ToIntFunction); + method public static java.util.Comparator comparingLong(java.util.function.ToLongFunction); method public abstract boolean equals(java.lang.Object); + method public static java.util.Comparator naturalOrder(); + method public static java.util.Comparator nullsFirst(java.util.Comparator); + method public static java.util.Comparator nullsLast(java.util.Comparator); + method public static java.util.Comparator reverseOrder(); + method public default java.util.Comparator reversed(); + method public default java.util.Comparator thenComparing(java.util.Comparator); + method public default java.util.Comparator thenComparing(java.util.function.Function, java.util.Comparator); + method public default java.util.Comparator thenComparing(java.util.function.Function); + method public default java.util.Comparator thenComparingDouble(java.util.function.ToDoubleFunction); + method public default java.util.Comparator thenComparingInt(java.util.function.ToIntFunction); + method public default java.util.Comparator thenComparingLong(java.util.function.ToLongFunction); } public class ConcurrentModificationException extends java.lang.RuntimeException { diff --git a/api/test-current.txt b/api/test-current.txt index 9bdd34da4e1f..b5c4a472bcd9 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -57495,7 +57495,23 @@ package java.util { public abstract interface Comparator { method public abstract int compare(T, T); + method public static java.util.Comparator comparing(java.util.function.Function, java.util.Comparator); + method public static java.util.Comparator comparing(java.util.function.Function); + method public static java.util.Comparator comparingDouble(java.util.function.ToDoubleFunction); + method public static java.util.Comparator comparingInt(java.util.function.ToIntFunction); + method public static java.util.Comparator comparingLong(java.util.function.ToLongFunction); method public abstract boolean equals(java.lang.Object); + method public static java.util.Comparator naturalOrder(); + method public static java.util.Comparator nullsFirst(java.util.Comparator); + method public static java.util.Comparator nullsLast(java.util.Comparator); + method public static java.util.Comparator reverseOrder(); + method public default java.util.Comparator reversed(); + method public default java.util.Comparator thenComparing(java.util.Comparator); + method public default java.util.Comparator thenComparing(java.util.function.Function, java.util.Comparator); + method public default java.util.Comparator thenComparing(java.util.function.Function); + method public default java.util.Comparator thenComparingDouble(java.util.function.ToDoubleFunction); + method public default java.util.Comparator thenComparingInt(java.util.function.ToIntFunction); + method public default java.util.Comparator thenComparingLong(java.util.function.ToLongFunction); } public class ConcurrentModificationException extends java.lang.RuntimeException { -- cgit v1.2.3-59-g8ed1b