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

Commit 7f5095dd authored by Tobias Thierer's avatar Tobias Thierer
Browse files

Revert "Revert "Track libcore update of Map classes to jdk8u60"" 

Automerger issues have been resolved. This change needs
to be rolled forward once Automerger merges
http://r.android.com/255655 from mirror-aosp-master into
stage-aosp-master.

This reverts commit 77832136.

Change-Id: I16e1d94351ccf7cc1aeb8f9905410cd23514e8ff
parent 77832136

api/test-current.txt

+8 −0
Original line number Diff line number Diff line
@@ -58835,9 +58835,17 @@ package java.util { 
    ctor public HashMap();

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

    method public java.lang.Object clone();

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

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

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

    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 V getOrDefault(java.lang.Object, V);

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

    method public V putIfAbsent(K, V);

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

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

    method public V replace(K, V);

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

  }