From 18d9fb485cd7cf110e7154ddd19bf658f3b73ed5 Mon Sep 17 00:00:00 2001 From: Przemyslaw Szczepaniak Date: Mon, 20 Jun 2016 17:49:43 +0100 Subject: [PATCH] Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a This change reverts previous fix for b/27582395 and makes AbstractStringBuffer an Appendable. Bug: 28666126 Bug: 27582395 Change-Id: I4b1b554fb47f45459eec24801af4ec798fc3039b --- api/current.txt | 14 ++++++++++---- api/system-current.txt | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/api/current.txt b/api/current.txt index 535eb113fd273..d3ab18294a105 100644 --- a/api/current.txt +++ b/api/current.txt @@ -47483,7 +47483,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); @@ -47502,6 +47505,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(); } @@ -49036,6 +49040,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); method public int lastIndexOf(int); method public int lastIndexOf(int, int); method public int lastIndexOf(java.lang.String); @@ -49074,7 +49080,7 @@ package java.lang { field public static final java.util.Comparator 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); @@ -49082,7 +49088,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); @@ -49112,7 +49118,7 @@ package java.lang { method public synchronized java.lang.String toString(); } - 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); diff --git a/api/system-current.txt b/api/system-current.txt index d8c52ade40519..292ac1938fe8a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -50101,7 +50101,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); @@ -50120,6 +50123,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(); } @@ -51654,6 +51658,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); method public int lastIndexOf(int); method public int lastIndexOf(int, int); method public int lastIndexOf(java.lang.String); @@ -51692,7 +51698,7 @@ package java.lang { field public static final java.util.Comparator 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); @@ -51700,7 +51706,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); @@ -51730,7 +51736,7 @@ package java.lang { method public synchronized java.lang.String toString(); } - 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);