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

am: 89d16125be

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

View File

@@ -50052,7 +50052,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);
@@ -50071,6 +50074,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();
}
@@ -51575,6 +51579,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);
@@ -51613,7 +51619,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);
@@ -51621,7 +51627,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);
@@ -51650,7 +51656,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

@@ -53513,7 +53513,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);
@@ -53532,6 +53535,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();
}
@@ -55036,6 +55040,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);
@@ -55074,7 +55080,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);
@@ -55082,7 +55088,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);
@@ -55111,7 +55117,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);