From d7c695d25b1b75657bcbba6b61d62931a1b27d09 Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Wed, 20 Apr 2016 15:15:52 +0100 Subject: [PATCH] Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce Bug: 27704598 Change-Id: I5cb900c7b48bc7b48ed0ea1110ff834e1d316de7 --- api/current.txt | 24 ++++++++---------------- api/system-current.txt | 24 ++++++++---------------- 2 files changed, 16 insertions(+), 32 deletions(-) diff --git a/api/current.txt b/api/current.txt index 2c40e8614cfb5..57e3c9b08d85d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -48219,16 +48219,13 @@ package java.lang { method public static java.lang.Class forName(java.lang.String, boolean, java.lang.ClassLoader) throws java.lang.ClassNotFoundException; method public A getAnnotation(java.lang.Class); method public java.lang.annotation.Annotation[] getAnnotations(); - method public T[] getAnnotationsByType(java.lang.Class); method public java.lang.String getCanonicalName(); method public java.lang.ClassLoader getClassLoader(); method public java.lang.Class[] getClasses(); method public java.lang.Class getComponentType(); method public java.lang.reflect.Constructor getConstructor(java.lang.Class...) throws java.lang.NoSuchMethodException, java.lang.SecurityException; method public java.lang.reflect.Constructor[] getConstructors() throws java.lang.SecurityException; - method public T getDeclaredAnnotation(java.lang.Class); method public java.lang.annotation.Annotation[] getDeclaredAnnotations(); - method public T[] getDeclaredAnnotationsByType(java.lang.Class); method public java.lang.Class[] getDeclaredClasses(); method public java.lang.reflect.Constructor getDeclaredConstructor(java.lang.Class...) throws java.lang.NoSuchMethodException, java.lang.SecurityException; method public java.lang.reflect.Constructor[] getDeclaredConstructors() throws java.lang.SecurityException; @@ -48259,7 +48256,6 @@ package java.lang { method public java.lang.Class getSuperclass(); method public synchronized java.lang.reflect.TypeVariable>[] getTypeParameters(); method public boolean isAnnotation(); - method public boolean isAnnotationPresent(java.lang.Class); method public boolean isAnonymousClass(); method public boolean isArray(); method public boolean isAssignableFrom(java.lang.Class); @@ -48802,10 +48798,10 @@ package java.lang { public class Package implements java.lang.reflect.AnnotatedElement { method public A getAnnotation(java.lang.Class); method public java.lang.annotation.Annotation[] getAnnotations(); - method public T[] getAnnotationsByType(java.lang.Class); - method public java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class); + method public A[] getAnnotationsByType(java.lang.Class); + method public A getDeclaredAnnotation(java.lang.Class); method public java.lang.annotation.Annotation[] getDeclaredAnnotations(); - method public T[] getDeclaredAnnotationsByType(java.lang.Class); + method public A[] getDeclaredAnnotationsByType(java.lang.Class); method public java.lang.String getImplementationTitle(); method public java.lang.String getImplementationVendor(); method public java.lang.String getImplementationVersion(); @@ -48815,7 +48811,6 @@ package java.lang { method public java.lang.String getSpecificationTitle(); method public java.lang.String getSpecificationVendor(); method public java.lang.String getSpecificationVersion(); - method public boolean isAnnotationPresent(java.lang.Class); method public boolean isCompatibleWith(java.lang.String) throws java.lang.NumberFormatException; method public boolean isSealed(); method public boolean isSealed(java.net.URL); @@ -49514,12 +49509,8 @@ package java.lang.reflect { ctor protected AccessibleObject(); method public T getAnnotation(java.lang.Class); method public java.lang.annotation.Annotation[] getAnnotations(); - method public T[] getAnnotationsByType(java.lang.Class); - method public java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class); method public java.lang.annotation.Annotation[] getDeclaredAnnotations(); - method public T[] getDeclaredAnnotationsByType(java.lang.Class); method public boolean isAccessible(); - method public boolean isAnnotationPresent(java.lang.Class); method public static void setAccessible(java.lang.reflect.AccessibleObject[], boolean) throws java.lang.SecurityException; method public void setAccessible(boolean) throws java.lang.SecurityException; } @@ -49527,11 +49518,11 @@ package java.lang.reflect { public abstract interface AnnotatedElement { method public abstract T getAnnotation(java.lang.Class); method public abstract java.lang.annotation.Annotation[] getAnnotations(); - method public abstract T[] getAnnotationsByType(java.lang.Class); - method public abstract java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class); + method public default T[] getAnnotationsByType(java.lang.Class); + method public default java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class); method public abstract java.lang.annotation.Annotation[] getDeclaredAnnotations(); - method public abstract T[] getDeclaredAnnotationsByType(java.lang.Class); - method public abstract boolean isAnnotationPresent(java.lang.Class); + method public default T[] getDeclaredAnnotationsByType(java.lang.Class); + method public default boolean isAnnotationPresent(java.lang.Class); } public final class Array { @@ -49595,6 +49586,7 @@ package java.lang.reflect { method public java.lang.String getName(); method public short getShort(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException; method public java.lang.Class getType(); + method public boolean isAnnotationPresent(java.lang.Class); method public boolean isEnumConstant(); method public boolean isSynthetic(); method public void set(java.lang.Object, java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException; diff --git a/api/system-current.txt b/api/system-current.txt index eaa17303f888c..f5c69786de909 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -50837,16 +50837,13 @@ package java.lang { method public static java.lang.Class forName(java.lang.String, boolean, java.lang.ClassLoader) throws java.lang.ClassNotFoundException; method public A getAnnotation(java.lang.Class); method public java.lang.annotation.Annotation[] getAnnotations(); - method public T[] getAnnotationsByType(java.lang.Class); method public java.lang.String getCanonicalName(); method public java.lang.ClassLoader getClassLoader(); method public java.lang.Class[] getClasses(); method public java.lang.Class getComponentType(); method public java.lang.reflect.Constructor getConstructor(java.lang.Class...) throws java.lang.NoSuchMethodException, java.lang.SecurityException; method public java.lang.reflect.Constructor[] getConstructors() throws java.lang.SecurityException; - method public T getDeclaredAnnotation(java.lang.Class); method public java.lang.annotation.Annotation[] getDeclaredAnnotations(); - method public T[] getDeclaredAnnotationsByType(java.lang.Class); method public java.lang.Class[] getDeclaredClasses(); method public java.lang.reflect.Constructor getDeclaredConstructor(java.lang.Class...) throws java.lang.NoSuchMethodException, java.lang.SecurityException; method public java.lang.reflect.Constructor[] getDeclaredConstructors() throws java.lang.SecurityException; @@ -50877,7 +50874,6 @@ package java.lang { method public java.lang.Class getSuperclass(); method public synchronized java.lang.reflect.TypeVariable>[] getTypeParameters(); method public boolean isAnnotation(); - method public boolean isAnnotationPresent(java.lang.Class); method public boolean isAnonymousClass(); method public boolean isArray(); method public boolean isAssignableFrom(java.lang.Class); @@ -51420,10 +51416,10 @@ package java.lang { public class Package implements java.lang.reflect.AnnotatedElement { method public A getAnnotation(java.lang.Class); method public java.lang.annotation.Annotation[] getAnnotations(); - method public T[] getAnnotationsByType(java.lang.Class); - method public java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class); + method public A[] getAnnotationsByType(java.lang.Class); + method public A getDeclaredAnnotation(java.lang.Class); method public java.lang.annotation.Annotation[] getDeclaredAnnotations(); - method public T[] getDeclaredAnnotationsByType(java.lang.Class); + method public A[] getDeclaredAnnotationsByType(java.lang.Class); method public java.lang.String getImplementationTitle(); method public java.lang.String getImplementationVendor(); method public java.lang.String getImplementationVersion(); @@ -51433,7 +51429,6 @@ package java.lang { method public java.lang.String getSpecificationTitle(); method public java.lang.String getSpecificationVendor(); method public java.lang.String getSpecificationVersion(); - method public boolean isAnnotationPresent(java.lang.Class); method public boolean isCompatibleWith(java.lang.String) throws java.lang.NumberFormatException; method public boolean isSealed(); method public boolean isSealed(java.net.URL); @@ -52132,12 +52127,8 @@ package java.lang.reflect { ctor protected AccessibleObject(); method public T getAnnotation(java.lang.Class); method public java.lang.annotation.Annotation[] getAnnotations(); - method public T[] getAnnotationsByType(java.lang.Class); - method public java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class); method public java.lang.annotation.Annotation[] getDeclaredAnnotations(); - method public T[] getDeclaredAnnotationsByType(java.lang.Class); method public boolean isAccessible(); - method public boolean isAnnotationPresent(java.lang.Class); method public static void setAccessible(java.lang.reflect.AccessibleObject[], boolean) throws java.lang.SecurityException; method public void setAccessible(boolean) throws java.lang.SecurityException; } @@ -52145,11 +52136,11 @@ package java.lang.reflect { public abstract interface AnnotatedElement { method public abstract T getAnnotation(java.lang.Class); method public abstract java.lang.annotation.Annotation[] getAnnotations(); - method public abstract T[] getAnnotationsByType(java.lang.Class); - method public abstract java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class); + method public default T[] getAnnotationsByType(java.lang.Class); + method public default java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class); method public abstract java.lang.annotation.Annotation[] getDeclaredAnnotations(); - method public abstract T[] getDeclaredAnnotationsByType(java.lang.Class); - method public abstract boolean isAnnotationPresent(java.lang.Class); + method public default T[] getDeclaredAnnotationsByType(java.lang.Class); + method public default boolean isAnnotationPresent(java.lang.Class); } public final class Array { @@ -52213,6 +52204,7 @@ package java.lang.reflect { method public java.lang.String getName(); method public short getShort(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException; method public java.lang.Class getType(); + method public boolean isAnnotationPresent(java.lang.Class); method public boolean isEnumConstant(); method public boolean isSynthetic(); method public void set(java.lang.Object, java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;