Merge \\\"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\\\" am: 36ce097dbb am: 12bb15c1d3

am: 387191bc64

Change-Id: I4bede82fd01c3a80a67dadf545e9ffdc1ab7c8e0
This commit is contained in:
Przemyslaw Szczepaniak
2016-06-24 11:38:01 +00:00
committed by android-build-merger
2 changed files with 20 additions and 8 deletions

View File

@@ -50028,7 +50028,10 @@ package java.lang {
ctor public AbstractMethodError(java.lang.String);
}
abstract class AbstractStringBuilder implements java.lang.CharSequence {
abstract class AbstractStringBuilder implements java.lang.Appendable java.lang.CharSequence {
method public java.lang.AbstractStringBuilder append(java.lang.CharSequence);
method public java.lang.AbstractStringBuilder append(java.lang.CharSequence, int, int);
method public java.lang.AbstractStringBuilder append(char);
method public int capacity();
method public char charAt(int);
method public int codePointAt(int);
@@ -50047,6 +50050,7 @@ package java.lang {
method public java.lang.CharSequence subSequence(int, int);
method public java.lang.String substring(int);
method public java.lang.String substring(int, int);
method public abstract java.lang.String toString();
method public void trimToSize();
}
@@ -51551,6 +51555,8 @@ package java.lang {
method public int indexOf(java.lang.String, int);
method public java.lang.String intern();
method public boolean isEmpty();
method public static java.lang.String join(java.lang.CharSequence, java.lang.CharSequence...);
method public static java.lang.String join(java.lang.CharSequence, java.lang.Iterable<? extends java.lang.CharSequence>);
method public int lastIndexOf(int);
method public int lastIndexOf(int, int);
method public int lastIndexOf(java.lang.String);
@@ -51589,7 +51595,7 @@ package java.lang {
field public static final java.util.Comparator<java.lang.String> CASE_INSENSITIVE_ORDER;
}
public final class StringBuffer extends java.lang.AbstractStringBuilder implements java.lang.Appendable java.lang.CharSequence java.io.Serializable {
public final class StringBuffer extends java.lang.AbstractStringBuilder implements java.lang.CharSequence java.io.Serializable {
ctor public StringBuffer();
ctor public StringBuffer(int);
ctor public StringBuffer(java.lang.String);
@@ -51597,7 +51603,7 @@ package java.lang {
method public synchronized java.lang.StringBuffer append(java.lang.Object);
method public synchronized java.lang.StringBuffer append(java.lang.String);
method public synchronized java.lang.StringBuffer append(java.lang.StringBuffer);
method public java.lang.StringBuffer append(java.lang.CharSequence);
method public synchronized java.lang.StringBuffer append(java.lang.CharSequence);
method public synchronized java.lang.StringBuffer append(java.lang.CharSequence, int, int);
method public synchronized java.lang.StringBuffer append(char[]);
method public synchronized java.lang.StringBuffer append(char[], int, int);
@@ -51626,7 +51632,7 @@ package java.lang {
method public synchronized java.lang.StringBuffer reverse();
}
public final class StringBuilder extends java.lang.AbstractStringBuilder implements java.lang.Appendable java.lang.CharSequence java.io.Serializable {
public final class StringBuilder extends java.lang.AbstractStringBuilder implements java.lang.CharSequence java.io.Serializable {
ctor public StringBuilder();
ctor public StringBuilder(int);
ctor public StringBuilder(java.lang.String);

View File

@@ -53489,7 +53489,10 @@ package java.lang {
ctor public AbstractMethodError(java.lang.String);
}
abstract class AbstractStringBuilder implements java.lang.CharSequence {
abstract class AbstractStringBuilder implements java.lang.Appendable java.lang.CharSequence {
method public java.lang.AbstractStringBuilder append(java.lang.CharSequence);
method public java.lang.AbstractStringBuilder append(java.lang.CharSequence, int, int);
method public java.lang.AbstractStringBuilder append(char);
method public int capacity();
method public char charAt(int);
method public int codePointAt(int);
@@ -53508,6 +53511,7 @@ package java.lang {
method public java.lang.CharSequence subSequence(int, int);
method public java.lang.String substring(int);
method public java.lang.String substring(int, int);
method public abstract java.lang.String toString();
method public void trimToSize();
}
@@ -55012,6 +55016,8 @@ package java.lang {
method public int indexOf(java.lang.String, int);
method public java.lang.String intern();
method public boolean isEmpty();
method public static java.lang.String join(java.lang.CharSequence, java.lang.CharSequence...);
method public static java.lang.String join(java.lang.CharSequence, java.lang.Iterable<? extends java.lang.CharSequence>);
method public int lastIndexOf(int);
method public int lastIndexOf(int, int);
method public int lastIndexOf(java.lang.String);
@@ -55050,7 +55056,7 @@ package java.lang {
field public static final java.util.Comparator<java.lang.String> CASE_INSENSITIVE_ORDER;
}
public final class StringBuffer extends java.lang.AbstractStringBuilder implements java.lang.Appendable java.lang.CharSequence java.io.Serializable {
public final class StringBuffer extends java.lang.AbstractStringBuilder implements java.lang.CharSequence java.io.Serializable {
ctor public StringBuffer();
ctor public StringBuffer(int);
ctor public StringBuffer(java.lang.String);
@@ -55058,7 +55064,7 @@ package java.lang {
method public synchronized java.lang.StringBuffer append(java.lang.Object);
method public synchronized java.lang.StringBuffer append(java.lang.String);
method public synchronized java.lang.StringBuffer append(java.lang.StringBuffer);
method public java.lang.StringBuffer append(java.lang.CharSequence);
method public synchronized java.lang.StringBuffer append(java.lang.CharSequence);
method public synchronized java.lang.StringBuffer append(java.lang.CharSequence, int, int);
method public synchronized java.lang.StringBuffer append(char[]);
method public synchronized java.lang.StringBuffer append(char[], int, int);
@@ -55087,7 +55093,7 @@ package java.lang {
method public synchronized java.lang.StringBuffer reverse();
}
public final class StringBuilder extends java.lang.AbstractStringBuilder implements java.lang.Appendable java.lang.CharSequence java.io.Serializable {
public final class StringBuilder extends java.lang.AbstractStringBuilder implements java.lang.CharSequence java.io.Serializable {
ctor public StringBuilder();
ctor public StringBuilder(int);
ctor public StringBuilder(java.lang.String);