commit f3d5a4dd60b3ec461e4d9fee97ce99a92cb29b1b
author Shubham Ajmera <shubhamajmera@google.com> Wed Apr 20 20:52:56 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 20 20:52:58 2016 +0000
tree 76614ed6a909004c32e7350e0b41abeb3e1f4b71
parent 3966fb942c7a9445a8cc94aeafc445778c2311b4
parent 6c69351469b9da7b424e9726c0bf878115a389b2

Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" into nyc-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 85abae9..823ceee 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -58087,6 +58087,7 @@
     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 void replaceAll(java.util.function.BiFunction<? super K, ? super V, ? extends V>);
   }
 
   public class IllegalFormatCodePointException extends java.util.IllegalFormatException {
@@ -59069,6 +59070,8 @@
     method public java.util.NavigableSet<K> navigableKeySet();
     method public java.util.Map.Entry<K, V> pollFirstEntry();
     method public java.util.Map.Entry<K, V> pollLastEntry();
+    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>);
     method public java.util.NavigableMap<K, V> subMap(K, boolean, K, boolean);
     method public java.util.SortedMap<K, V> subMap(K, K);

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 4cf6436..78039ae 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -61393,6 +61393,7 @@
     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 void replaceAll(java.util.function.BiFunction<? super K, ? super V, ? extends V>);
   }
 
   public class IllegalFormatCodePointException extends java.util.IllegalFormatException {
@@ -62375,6 +62376,8 @@
     method public java.util.NavigableSet<K> navigableKeySet();
     method public java.util.Map.Entry<K, V> pollFirstEntry();
     method public java.util.Map.Entry<K, V> pollLastEntry();
+    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>);
     method public java.util.NavigableMap<K, V> subMap(K, boolean, K, boolean);
     method public java.util.SortedMap<K, V> subMap(K, K);

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 3dddfcf..6fddf8c 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -58165,6 +58165,7 @@
     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 void replaceAll(java.util.function.BiFunction<? super K, ? super V, ? extends V>);
   }
 
   public class IllegalFormatCodePointException extends java.util.IllegalFormatException {
@@ -59147,6 +59148,8 @@
     method public java.util.NavigableSet<K> navigableKeySet();
     method public java.util.Map.Entry<K, V> pollFirstEntry();
     method public java.util.Map.Entry<K, V> pollLastEntry();
+    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>);
     method public java.util.NavigableMap<K, V> subMap(K, boolean, K, boolean);
     method public java.util.SortedMap<K, V> subMap(K, K);