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

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

Merge "API: Update Collections to OpenJDK8u60" am: 815fb547 am: b8557c43 

am: 6a5fccdc

Change-Id: I2636fb0fc54bbf0958b498494f4d587aa283b7d4
parents 4be45a09 6a5fccdc

api/current.txt

+11 −0
Original line number Diff line number Diff line
@@ -60704,6 +60704,9 @@ package java.util { 
    method public static <E> java.util.Collection<E> checkedCollection(java.util.Collection<E>, java.lang.Class<E>);

    method public static <E> java.util.List<E> checkedList(java.util.List<E>, java.lang.Class<E>);

    method public static <K, V> java.util.Map<K, V> checkedMap(java.util.Map<K, V>, java.lang.Class<K>, java.lang.Class<V>);

    method public static <K, V> java.util.NavigableMap<K, V> checkedNavigableMap(java.util.NavigableMap<K, V>, java.lang.Class<K>, java.lang.Class<V>);

    method public static <E> java.util.NavigableSet<E> checkedNavigableSet(java.util.NavigableSet<E>, java.lang.Class<E>);

    method public static <E> java.util.Queue<E> checkedQueue(java.util.Queue<E>, java.lang.Class<E>);

    method public static <E> java.util.Set<E> checkedSet(java.util.Set<E>, java.lang.Class<E>);

    method public static <K, V> java.util.SortedMap<K, V> checkedSortedMap(java.util.SortedMap<K, V>, java.lang.Class<K>, java.lang.Class<V>);

    method public static <E> java.util.SortedSet<E> checkedSortedSet(java.util.SortedSet<E>, java.lang.Class<E>);
@@ -60714,7 +60717,11 @@ package java.util { 
    method public static final <T> java.util.List<T> emptyList();

    method public static <T> java.util.ListIterator<T> emptyListIterator();

    method public static final <K, V> java.util.Map<K, V> emptyMap();

    method public static final <K, V> java.util.NavigableMap<K, V> emptyNavigableMap();

    method public static <E> java.util.NavigableSet<E> emptyNavigableSet();

    method public static final <T> java.util.Set<T> emptySet();

    method public static final <K, V> java.util.SortedMap<K, V> emptySortedMap();

    method public static <E> java.util.SortedSet<E> emptySortedSet();

    method public static <T> java.util.Enumeration<T> enumeration(java.util.Collection<T>);

    method public static <T> void fill(java.util.List<? super T>, T);

    method public static int frequency(java.util.Collection<?>, java.lang.Object);
@@ -60743,12 +60750,16 @@ package java.util { 
    method public static <T> java.util.Collection<T> synchronizedCollection(java.util.Collection<T>);

    method public static <T> java.util.List<T> synchronizedList(java.util.List<T>);

    method public static <K, V> java.util.Map<K, V> synchronizedMap(java.util.Map<K, V>);

    method public static <K, V> java.util.NavigableMap<K, V> synchronizedNavigableMap(java.util.NavigableMap<K, V>);

    method public static <T> java.util.NavigableSet<T> synchronizedNavigableSet(java.util.NavigableSet<T>);

    method public static <T> java.util.Set<T> synchronizedSet(java.util.Set<T>);

    method public static <K, V> java.util.SortedMap<K, V> synchronizedSortedMap(java.util.SortedMap<K, V>);

    method public static <T> java.util.SortedSet<T> synchronizedSortedSet(java.util.SortedSet<T>);

    method public static <T> java.util.Collection<T> unmodifiableCollection(java.util.Collection<? extends T>);

    method public static <T> java.util.List<T> unmodifiableList(java.util.List<? extends T>);

    method public static <K, V> java.util.Map<K, V> unmodifiableMap(java.util.Map<? extends K, ? extends V>);

    method public static <K, V> java.util.NavigableMap<K, V> unmodifiableNavigableMap(java.util.NavigableMap<K, ? extends V>);

    method public static <T> java.util.NavigableSet<T> unmodifiableNavigableSet(java.util.NavigableSet<T>);

    method public static <T> java.util.Set<T> unmodifiableSet(java.util.Set<? extends T>);

    method public static <K, V> java.util.SortedMap<K, V> unmodifiableSortedMap(java.util.SortedMap<K, ? extends V>);

    method public static <T> java.util.SortedSet<T> unmodifiableSortedSet(java.util.SortedSet<T>);

api/system-current.txt

+11 −0
Original line number Diff line number Diff line
@@ -64315,6 +64315,9 @@ package java.util { 
    method public static <E> java.util.Collection<E> checkedCollection(java.util.Collection<E>, java.lang.Class<E>);

    method public static <E> java.util.List<E> checkedList(java.util.List<E>, java.lang.Class<E>);

    method public static <K, V> java.util.Map<K, V> checkedMap(java.util.Map<K, V>, java.lang.Class<K>, java.lang.Class<V>);

    method public static <K, V> java.util.NavigableMap<K, V> checkedNavigableMap(java.util.NavigableMap<K, V>, java.lang.Class<K>, java.lang.Class<V>);

    method public static <E> java.util.NavigableSet<E> checkedNavigableSet(java.util.NavigableSet<E>, java.lang.Class<E>);

    method public static <E> java.util.Queue<E> checkedQueue(java.util.Queue<E>, java.lang.Class<E>);

    method public static <E> java.util.Set<E> checkedSet(java.util.Set<E>, java.lang.Class<E>);

    method public static <K, V> java.util.SortedMap<K, V> checkedSortedMap(java.util.SortedMap<K, V>, java.lang.Class<K>, java.lang.Class<V>);

    method public static <E> java.util.SortedSet<E> checkedSortedSet(java.util.SortedSet<E>, java.lang.Class<E>);
@@ -64325,7 +64328,11 @@ package java.util { 
    method public static final <T> java.util.List<T> emptyList();

    method public static <T> java.util.ListIterator<T> emptyListIterator();

    method public static final <K, V> java.util.Map<K, V> emptyMap();

    method public static final <K, V> java.util.NavigableMap<K, V> emptyNavigableMap();

    method public static <E> java.util.NavigableSet<E> emptyNavigableSet();

    method public static final <T> java.util.Set<T> emptySet();

    method public static final <K, V> java.util.SortedMap<K, V> emptySortedMap();

    method public static <E> java.util.SortedSet<E> emptySortedSet();

    method public static <T> java.util.Enumeration<T> enumeration(java.util.Collection<T>);

    method public static <T> void fill(java.util.List<? super T>, T);

    method public static int frequency(java.util.Collection<?>, java.lang.Object);
@@ -64354,12 +64361,16 @@ package java.util { 
    method public static <T> java.util.Collection<T> synchronizedCollection(java.util.Collection<T>);

    method public static <T> java.util.List<T> synchronizedList(java.util.List<T>);

    method public static <K, V> java.util.Map<K, V> synchronizedMap(java.util.Map<K, V>);

    method public static <K, V> java.util.NavigableMap<K, V> synchronizedNavigableMap(java.util.NavigableMap<K, V>);

    method public static <T> java.util.NavigableSet<T> synchronizedNavigableSet(java.util.NavigableSet<T>);

    method public static <T> java.util.Set<T> synchronizedSet(java.util.Set<T>);

    method public static <K, V> java.util.SortedMap<K, V> synchronizedSortedMap(java.util.SortedMap<K, V>);

    method public static <T> java.util.SortedSet<T> synchronizedSortedSet(java.util.SortedSet<T>);

    method public static <T> java.util.Collection<T> unmodifiableCollection(java.util.Collection<? extends T>);

    method public static <T> java.util.List<T> unmodifiableList(java.util.List<? extends T>);

    method public static <K, V> java.util.Map<K, V> unmodifiableMap(java.util.Map<? extends K, ? extends V>);

    method public static <K, V> java.util.NavigableMap<K, V> unmodifiableNavigableMap(java.util.NavigableMap<K, ? extends V>);

    method public static <T> java.util.NavigableSet<T> unmodifiableNavigableSet(java.util.NavigableSet<T>);

    method public static <T> java.util.Set<T> unmodifiableSet(java.util.Set<? extends T>);

    method public static <K, V> java.util.SortedMap<K, V> unmodifiableSortedMap(java.util.SortedMap<K, ? extends V>);

    method public static <T> java.util.SortedSet<T> unmodifiableSortedSet(java.util.SortedSet<T>);

api/test-current.txt

+11 −0
Original line number Diff line number Diff line
@@ -60795,6 +60795,9 @@ package java.util { 
    method public static <E> java.util.Collection<E> checkedCollection(java.util.Collection<E>, java.lang.Class<E>);

    method public static <E> java.util.List<E> checkedList(java.util.List<E>, java.lang.Class<E>);

    method public static <K, V> java.util.Map<K, V> checkedMap(java.util.Map<K, V>, java.lang.Class<K>, java.lang.Class<V>);

    method public static <K, V> java.util.NavigableMap<K, V> checkedNavigableMap(java.util.NavigableMap<K, V>, java.lang.Class<K>, java.lang.Class<V>);

    method public static <E> java.util.NavigableSet<E> checkedNavigableSet(java.util.NavigableSet<E>, java.lang.Class<E>);

    method public static <E> java.util.Queue<E> checkedQueue(java.util.Queue<E>, java.lang.Class<E>);

    method public static <E> java.util.Set<E> checkedSet(java.util.Set<E>, java.lang.Class<E>);

    method public static <K, V> java.util.SortedMap<K, V> checkedSortedMap(java.util.SortedMap<K, V>, java.lang.Class<K>, java.lang.Class<V>);

    method public static <E> java.util.SortedSet<E> checkedSortedSet(java.util.SortedSet<E>, java.lang.Class<E>);
@@ -60805,7 +60808,11 @@ package java.util { 
    method public static final <T> java.util.List<T> emptyList();

    method public static <T> java.util.ListIterator<T> emptyListIterator();

    method public static final <K, V> java.util.Map<K, V> emptyMap();

    method public static final <K, V> java.util.NavigableMap<K, V> emptyNavigableMap();

    method public static <E> java.util.NavigableSet<E> emptyNavigableSet();

    method public static final <T> java.util.Set<T> emptySet();

    method public static final <K, V> java.util.SortedMap<K, V> emptySortedMap();

    method public static <E> java.util.SortedSet<E> emptySortedSet();

    method public static <T> java.util.Enumeration<T> enumeration(java.util.Collection<T>);

    method public static <T> void fill(java.util.List<? super T>, T);

    method public static int frequency(java.util.Collection<?>, java.lang.Object);
@@ -60834,12 +60841,16 @@ package java.util { 
    method public static <T> java.util.Collection<T> synchronizedCollection(java.util.Collection<T>);

    method public static <T> java.util.List<T> synchronizedList(java.util.List<T>);

    method public static <K, V> java.util.Map<K, V> synchronizedMap(java.util.Map<K, V>);

    method public static <K, V> java.util.NavigableMap<K, V> synchronizedNavigableMap(java.util.NavigableMap<K, V>);

    method public static <T> java.util.NavigableSet<T> synchronizedNavigableSet(java.util.NavigableSet<T>);

    method public static <T> java.util.Set<T> synchronizedSet(java.util.Set<T>);

    method public static <K, V> java.util.SortedMap<K, V> synchronizedSortedMap(java.util.SortedMap<K, V>);

    method public static <T> java.util.SortedSet<T> synchronizedSortedSet(java.util.SortedSet<T>);

    method public static <T> java.util.Collection<T> unmodifiableCollection(java.util.Collection<? extends T>);

    method public static <T> java.util.List<T> unmodifiableList(java.util.List<? extends T>);

    method public static <K, V> java.util.Map<K, V> unmodifiableMap(java.util.Map<? extends K, ? extends V>);

    method public static <K, V> java.util.NavigableMap<K, V> unmodifiableNavigableMap(java.util.NavigableMap<K, ? extends V>);

    method public static <T> java.util.NavigableSet<T> unmodifiableNavigableSet(java.util.NavigableSet<T>);

    method public static <T> java.util.Set<T> unmodifiableSet(java.util.Set<? extends T>);

    method public static <K, V> java.util.SortedMap<K, V> unmodifiableSortedMap(java.util.SortedMap<K, ? extends V>);

    method public static <T> java.util.SortedSet<T> unmodifiableSortedSet(java.util.SortedSet<T>);