Merge "Track libcore java.lang.reflect API changes" am: cff3f7001c
am: 033101bb99
Change-Id: I230bfff78e929b646c044f0f362531f05e16f632
diff --git a/api/current.txt b/api/current.txt
index 195b640..cac43c4 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -50450,12 +50450,14 @@
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<A>);
method public java.lang.annotation.Annotation[] getAnnotations();
+ method public A[] getAnnotationsByType(java.lang.Class<A>);
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<T> getConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
method public java.lang.reflect.Constructor<?>[] getConstructors() throws java.lang.SecurityException;
+ method public A getDeclaredAnnotation(java.lang.Class<A>);
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public java.lang.Class<?>[] getDeclaredClasses();
method public java.lang.reflect.Constructor<T> getDeclaredConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
@@ -51897,7 +51899,6 @@
public final class Field extends java.lang.reflect.AccessibleObject implements java.lang.reflect.Member {
method public java.lang.Object get(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
- method public A getAnnotation(java.lang.Class<A>);
method public boolean getBoolean(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
method public byte getByte(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
method public char getChar(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
@@ -51929,7 +51930,7 @@
method public abstract java.lang.reflect.Type getGenericComponentType();
}
- public abstract interface GenericDeclaration {
+ public abstract interface GenericDeclaration implements java.lang.reflect.AnnotatedElement {
method public abstract java.lang.reflect.TypeVariable<?>[] getTypeParameters();
}
diff --git a/api/system-current.txt b/api/system-current.txt
index c9aec47..01471a1 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -53807,12 +53807,14 @@
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<A>);
method public java.lang.annotation.Annotation[] getAnnotations();
+ method public A[] getAnnotationsByType(java.lang.Class<A>);
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<T> getConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
method public java.lang.reflect.Constructor<?>[] getConstructors() throws java.lang.SecurityException;
+ method public A getDeclaredAnnotation(java.lang.Class<A>);
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public java.lang.Class<?>[] getDeclaredClasses();
method public java.lang.reflect.Constructor<T> getDeclaredConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
@@ -55254,7 +55256,6 @@
public final class Field extends java.lang.reflect.AccessibleObject implements java.lang.reflect.Member {
method public java.lang.Object get(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
- method public A getAnnotation(java.lang.Class<A>);
method public boolean getBoolean(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
method public byte getByte(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
method public char getChar(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
@@ -55286,7 +55287,7 @@
method public abstract java.lang.reflect.Type getGenericComponentType();
}
- public abstract interface GenericDeclaration {
+ public abstract interface GenericDeclaration implements java.lang.reflect.AnnotatedElement {
method public abstract java.lang.reflect.TypeVariable<?>[] getTypeParameters();
}
diff --git a/api/test-current.txt b/api/test-current.txt
index d06e5cf..5c01377 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -50530,12 +50530,14 @@
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<A>);
method public java.lang.annotation.Annotation[] getAnnotations();
+ method public A[] getAnnotationsByType(java.lang.Class<A>);
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<T> getConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
method public java.lang.reflect.Constructor<?>[] getConstructors() throws java.lang.SecurityException;
+ method public A getDeclaredAnnotation(java.lang.Class<A>);
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public java.lang.Class<?>[] getDeclaredClasses();
method public java.lang.reflect.Constructor<T> getDeclaredConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
@@ -51977,7 +51979,6 @@
public final class Field extends java.lang.reflect.AccessibleObject implements java.lang.reflect.Member {
method public java.lang.Object get(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
- method public A getAnnotation(java.lang.Class<A>);
method public boolean getBoolean(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
method public byte getByte(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
method public char getChar(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
@@ -52009,7 +52010,7 @@
method public abstract java.lang.reflect.Type getGenericComponentType();
}
- public abstract interface GenericDeclaration {
+ public abstract interface GenericDeclaration implements java.lang.reflect.AnnotatedElement {
method public abstract java.lang.reflect.TypeVariable<?>[] getTypeParameters();
}