Merge "Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24."

This commit is contained in:
Narayan Kamath
2016-03-04 12:41:50 +00:00
committed by Gerrit Code Review
2 changed files with 4 additions and 8 deletions

View File

@@ -10037,7 +10037,6 @@ package android.database {
method public boolean hasNext();
method public java.util.Iterator<android.database.CursorJoiner.Result> iterator();
method public android.database.CursorJoiner.Result next();
method public void remove();
}
public static final class CursorJoiner.Result extends java.lang.Enum {
@@ -36654,7 +36653,6 @@ package android.text {
method public boolean hasNext();
method public java.util.Iterator<java.lang.String> iterator();
method public java.lang.String next();
method public void remove();
method public void setString(java.lang.String);
}
@@ -55656,9 +55654,10 @@ package java.util {
}
public abstract interface Iterator {
method public default void forEachRemaining(java.util.function.Consumer<? super E>);
method public abstract boolean hasNext();
method public abstract E next();
method public abstract void remove();
method public default void remove();
}
public class LinkedHashMap extends java.util.HashMap implements java.util.Map {
@@ -56180,7 +56179,6 @@ package java.util {
method public short nextShort();
method public short nextShort(int);
method public int radix();
method public void remove();
method public java.util.Scanner reset();
method public java.util.Scanner skip(java.util.regex.Pattern);
method public java.util.Scanner skip(java.lang.String);

View File

@@ -10375,7 +10375,6 @@ package android.database {
method public boolean hasNext();
method public java.util.Iterator<android.database.CursorJoiner.Result> iterator();
method public android.database.CursorJoiner.Result next();
method public void remove();
}
public static final class CursorJoiner.Result extends java.lang.Enum {
@@ -38958,7 +38957,6 @@ package android.text {
method public boolean hasNext();
method public java.util.Iterator<java.lang.String> iterator();
method public java.lang.String next();
method public void remove();
method public void setString(java.lang.String);
}
@@ -58274,9 +58272,10 @@ package java.util {
}
public abstract interface Iterator {
method public default void forEachRemaining(java.util.function.Consumer<? super E>);
method public abstract boolean hasNext();
method public abstract E next();
method public abstract void remove();
method public default void remove();
}
public class LinkedHashMap extends java.util.HashMap implements java.util.Map {
@@ -58798,7 +58797,6 @@ package java.util {
method public short nextShort();
method public short nextShort(int);
method public int radix();
method public void remove();
method public java.util.Scanner reset();
method public java.util.Scanner skip(java.util.regex.Pattern);
method public java.util.Scanner skip(java.lang.String);