From c32718d4b6f923a377da2066c9430c952129bea1 Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Tue, 8 Mar 2016 09:21:18 +0000 Subject: [PATCH] Track libcore change f121f31fd91c5a557225cd6a97418e716529eb2d Bug: 27427010 Change-Id: I5527f34ef6bf15aaa1a39b705e951122ae4b3d5a --- api/current.txt | 16 ++++++++++++++++ api/system-current.txt | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/api/current.txt b/api/current.txt index c1f2623c53d5a..64e3458275bd0 100644 --- a/api/current.txt +++ b/api/current.txt @@ -55329,7 +55329,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 14edbcbae2536..7a193880f5abe 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -57947,7 +57947,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 {