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

Commit e2f64506 authored by Shubham Ajmera's avatar Shubham Ajmera Committed by android-build-merger
Browse files

Merge changes from topics \'list_default_method\', \'map_default_methods\' into nyc-dev am: 1f8fb9f9 

am: dea351a2

* commit 'dea351a2':
  Add OpenJDK 8 java.util.List Default Methods
  Port OpenJDK8 changes in java.util.Map

Change-Id: Ie083d5b46679742040f899973061049a64977220
parents 7cb73aa0 dea351a2

api/current.txt

+16 −0
Original line number Diff line number Diff line
@@ -57335,6 +57335,7 @@ package java.util { 
    method public void forEach(java.util.function.Consumer<? super E>);

    method public E get(int);

    method public boolean removeIf(java.util.function.Predicate<? super E>);

    method public void replaceAll(java.util.function.UnaryOperator<E>);

    method public int size();

    method public void sort(java.util.Comparator<? super E>);

    method public java.util.Spliterator<E> spliterator();
@@ -57972,6 +57973,7 @@ package java.util { 
    method public java.lang.Object clone();

    method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();

    method public void forEach(java.util.function.BiConsumer<? super K, ? super V>);

    method public boolean replace(K, V, V);

  }















  public class HashSet extends java.util.AbstractSet implements java.lang.Cloneable java.io.Serializable java.util.Set {









@@ -57992,6 +57994,9 @@ package java.util {













    ctor public Hashtable(java.util.Map<? extends K, ? extends V>);















    method public synchronized void clear();















    method public synchronized java.lang.Object clone();













    method public synchronized V compute(K, java.util.function.BiFunction<? super K, ? super V, ? extends V>);













    method public synchronized V computeIfAbsent(K, java.util.function.Function<? super K, ? extends V>);













    method public synchronized V computeIfPresent(K, java.util.function.BiFunction<? super K, ? super V, ? extends V>);















    method public synchronized boolean contains(java.lang.Object);















    method public synchronized boolean containsKey(java.lang.Object);















    method public boolean containsValue(java.lang.Object);









@@ -57999,13 +58004,19 @@ package java.util {













    method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();















    method public synchronized void forEach(java.util.function.BiConsumer<? super K, ? super V>);















    method public synchronized V get(java.lang.Object);













    method public synchronized V getOrDefault(java.lang.Object, V);















    method public synchronized boolean isEmpty();















    method public java.util.Set<K> keySet();















    method public synchronized java.util.Enumeration<K> keys();













    method public synchronized V merge(K, V, java.util.function.BiFunction<? super V, ? super V, ? extends V>);















    method public synchronized V put(K, V);















    method public synchronized void putAll(java.util.Map<? extends K, ? extends V>);













    method public synchronized V putIfAbsent(K, V);















    method protected void rehash();















    method public synchronized V remove(java.lang.Object);













    method public synchronized boolean remove(java.lang.Object, java.lang.Object);













    method public synchronized boolean replace(K, V, V);













    method public synchronized V replace(K, V);















    method public synchronized int size();















    method public java.util.Collection<V> values();















  }










@@ -58150,9 +58161,11 @@ package java.util {













    method public abstract boolean remove(java.lang.Object);















    method public abstract E remove(int);















    method public abstract boolean removeAll(java.util.Collection<?>);













    method public default void replaceAll(java.util.function.UnaryOperator<E>);















    method public abstract boolean retainAll(java.util.Collection<?>);















    method public abstract E set(int, E);















    method public abstract int size();













    method public default void sort(java.util.Comparator<? super E>);















    method public abstract java.util.List<E> subList(int, int);















    method public abstract java.lang.Object[] toArray();















    method public abstract T[] toArray(T[]);










@@ -59067,9 +59080,11 @@ package java.util {













    method public synchronized boolean removeElement(java.lang.Object);















    method public synchronized void removeElementAt(int);















    method public synchronized boolean removeIf(java.util.function.Predicate<? super E>);













    method public synchronized void replaceAll(java.util.function.UnaryOperator<E>);















    method public synchronized void setElementAt(E, int);















    method public synchronized void setSize(int);















    method public synchronized int size();













    method public synchronized void sort(java.util.Comparator<? super E>);















    method public java.util.Spliterator<E> spliterator();















    method public synchronized void trimToSize();















    field protected int capacityIncrement;










@@ -59535,6 +59550,7 @@ package java.util.concurrent {













    method public java.lang.Object clone();















    method public boolean contains(java.lang.Object);















    method public boolean containsAll(java.util.Collection<?>);













    method public void forEach(java.util.function.Consumer<? super E>);















    method public E get(int);















    method public int indexOf(E, int);















    method public int indexOf(java.lang.Object);

























api/system-current.txt



+16
−0






























Original line number
Diff line number
Diff line








@@ -60399,6 +60399,7 @@ package java.util {













    method public void forEach(java.util.function.Consumer<? super E>);















    method public E get(int);















    method public boolean removeIf(java.util.function.Predicate<? super E>);













    method public void replaceAll(java.util.function.UnaryOperator<E>);















    method public int size();















    method public void sort(java.util.Comparator<? super E>);















    method public java.util.Spliterator<E> spliterator();










@@ -61036,6 +61037,7 @@ package java.util {













    method public java.lang.Object clone();















    method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();















    method public void forEach(java.util.function.BiConsumer<? super K, ? super V>);













    method public boolean replace(K, V, V);















  }





























  public class HashSet extends java.util.AbstractSet implements java.lang.Cloneable java.io.Serializable java.util.Set {









@@ -61056,6 +61058,9 @@ package java.util {













    ctor public Hashtable(java.util.Map<? extends K, ? extends V>);















    method public synchronized void clear();















    method public synchronized java.lang.Object clone();













    method public synchronized V compute(K, java.util.function.BiFunction<? super K, ? super V, ? extends V>);













    method public synchronized V computeIfAbsent(K, java.util.function.Function<? super K, ? extends V>);













    method public synchronized V computeIfPresent(K, java.util.function.BiFunction<? super K, ? super V, ? extends V>);















    method public synchronized boolean contains(java.lang.Object);















    method public synchronized boolean containsKey(java.lang.Object);















    method public boolean containsValue(java.lang.Object);









@@ -61063,13 +61068,19 @@ package java.util {













    method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();















    method public synchronized void forEach(java.util.function.BiConsumer<? super K, ? super V>);















    method public synchronized V get(java.lang.Object);













    method public synchronized V getOrDefault(java.lang.Object, V);















    method public synchronized boolean isEmpty();















    method public java.util.Set<K> keySet();















    method public synchronized java.util.Enumeration<K> keys();













    method public synchronized V merge(K, V, java.util.function.BiFunction<? super V, ? super V, ? extends V>);















    method public synchronized V put(K, V);















    method public synchronized void putAll(java.util.Map<? extends K, ? extends V>);













    method public synchronized V putIfAbsent(K, V);















    method protected void rehash();















    method public synchronized V remove(java.lang.Object);













    method public synchronized boolean remove(java.lang.Object, java.lang.Object);













    method public synchronized boolean replace(K, V, V);













    method public synchronized V replace(K, V);















    method public synchronized int size();















    method public java.util.Collection<V> values();















  }










@@ -61214,9 +61225,11 @@ package java.util {













    method public abstract boolean remove(java.lang.Object);















    method public abstract E remove(int);















    method public abstract boolean removeAll(java.util.Collection<?>);













    method public default void replaceAll(java.util.function.UnaryOperator<E>);















    method public abstract boolean retainAll(java.util.Collection<?>);















    method public abstract E set(int, E);















    method public abstract int size();













    method public default void sort(java.util.Comparator<? super E>);















    method public abstract java.util.List<E> subList(int, int);















    method public abstract java.lang.Object[] toArray();















    method public abstract T[] toArray(T[]);










@@ -62131,9 +62144,11 @@ package java.util {













    method public synchronized boolean removeElement(java.lang.Object);















    method public synchronized void removeElementAt(int);















    method public synchronized boolean removeIf(java.util.function.Predicate<? super E>);













    method public synchronized void replaceAll(java.util.function.UnaryOperator<E>);















    method public synchronized void setElementAt(E, int);















    method public synchronized void setSize(int);















    method public synchronized int size();













    method public synchronized void sort(java.util.Comparator<? super E>);















    method public java.util.Spliterator<E> spliterator();















    method public synchronized void trimToSize();















    field protected int capacityIncrement;










@@ -62599,6 +62614,7 @@ package java.util.concurrent {













    method public java.lang.Object clone();















    method public boolean contains(java.lang.Object);















    method public boolean containsAll(java.util.Collection<?>);













    method public void forEach(java.util.function.Consumer<? super E>);















    method public E get(int);















    method public int indexOf(E, int);















    method public int indexOf(java.lang.Object);

























api/test-current.txt



+16
−0






























Original line number
Diff line number
Diff line








@@ -57409,6 +57409,7 @@ package java.util {













    method public void forEach(java.util.function.Consumer<? super E>);















    method public E get(int);















    method public boolean removeIf(java.util.function.Predicate<? super E>);













    method public void replaceAll(java.util.function.UnaryOperator<E>);















    method public int size();















    method public void sort(java.util.Comparator<? super E>);















    method public java.util.Spliterator<E> spliterator();










@@ -58046,6 +58047,7 @@ package java.util {













    method public java.lang.Object clone();















    method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();















    method public void forEach(java.util.function.BiConsumer<? super K, ? super V>);













    method public boolean replace(K, V, V);















  }





























  public class HashSet extends java.util.AbstractSet implements java.lang.Cloneable java.io.Serializable java.util.Set {









@@ -58066,6 +58068,9 @@ package java.util {













    ctor public Hashtable(java.util.Map<? extends K, ? extends V>);















    method public synchronized void clear();















    method public synchronized java.lang.Object clone();













    method public synchronized V compute(K, java.util.function.BiFunction<? super K, ? super V, ? extends V>);













    method public synchronized V computeIfAbsent(K, java.util.function.Function<? super K, ? extends V>);













    method public synchronized V computeIfPresent(K, java.util.function.BiFunction<? super K, ? super V, ? extends V>);















    method public synchronized boolean contains(java.lang.Object);















    method public synchronized boolean containsKey(java.lang.Object);















    method public boolean containsValue(java.lang.Object);









@@ -58073,13 +58078,19 @@ package java.util {













    method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();















    method public synchronized void forEach(java.util.function.BiConsumer<? super K, ? super V>);















    method public synchronized V get(java.lang.Object);













    method public synchronized V getOrDefault(java.lang.Object, V);















    method public synchronized boolean isEmpty();















    method public java.util.Set<K> keySet();















    method public synchronized java.util.Enumeration<K> keys();













    method public synchronized V merge(K, V, java.util.function.BiFunction<? super V, ? super V, ? extends V>);















    method public synchronized V put(K, V);















    method public synchronized void putAll(java.util.Map<? extends K, ? extends V>);













    method public synchronized V putIfAbsent(K, V);















    method protected void rehash();















    method public synchronized V remove(java.lang.Object);













    method public synchronized boolean remove(java.lang.Object, java.lang.Object);













    method public synchronized boolean replace(K, V, V);













    method public synchronized V replace(K, V);















    method public synchronized int size();















    method public java.util.Collection<V> values();















  }










@@ -58224,9 +58235,11 @@ package java.util {













    method public abstract boolean remove(java.lang.Object);















    method public abstract E remove(int);















    method public abstract boolean removeAll(java.util.Collection<?>);













    method public default void replaceAll(java.util.function.UnaryOperator<E>);















    method public abstract boolean retainAll(java.util.Collection<?>);















    method public abstract E set(int, E);















    method public abstract int size();













    method public default void sort(java.util.Comparator<? super E>);















    method public abstract java.util.List<E> subList(int, int);















    method public abstract java.lang.Object[] toArray();















    method public abstract T[] toArray(T[]);










@@ -59141,9 +59154,11 @@ package java.util {













    method public synchronized boolean removeElement(java.lang.Object);















    method public synchronized void removeElementAt(int);















    method public synchronized boolean removeIf(java.util.function.Predicate<? super E>);













    method public synchronized void replaceAll(java.util.function.UnaryOperator<E>);















    method public synchronized void setElementAt(E, int);















    method public synchronized void setSize(int);















    method public synchronized int size();













    method public synchronized void sort(java.util.Comparator<? super E>);















    method public java.util.Spliterator<E> spliterator();















    method public synchronized void trimToSize();















    field protected int capacityIncrement;










@@ -59609,6 +59624,7 @@ package java.util.concurrent {













    method public java.lang.Object clone();















    method public boolean contains(java.lang.Object);















    method public boolean containsAll(java.util.Collection<?>);













    method public void forEach(java.util.function.Consumer<? super E>);















    method public E get(int);















    method public int indexOf(E, int);















    method public int indexOf(java.lang.Object);