Merge "Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce" am: d5aca1a

am: 448d39f

* commit '448d39f7ae40b5bf49929905bded367d4b01b1ea':
  Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce

Change-Id: Iaa22c1cea16304d3a4958973162c79344b7911f3
This commit is contained in:
Yi Kong
2016-04-20 15:48:00 +00:00
committed by android-build-merger
2 changed files with 16 additions and 32 deletions

View File

@@ -50589,16 +50589,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<A>);
method public java.lang.annotation.Annotation[] getAnnotations();
method public T[] getAnnotationsByType(java.lang.Class<T>);
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 T getDeclaredAnnotation(java.lang.Class<T>);
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public T[] getDeclaredAnnotationsByType(java.lang.Class<T>);
method public java.lang.Class<?>[] getDeclaredClasses();
method public java.lang.reflect.Constructor<T> getDeclaredConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
method public java.lang.reflect.Constructor<?>[] getDeclaredConstructors() throws java.lang.SecurityException;
@@ -50629,7 +50626,6 @@ package java.lang {
method public java.lang.Class<? super T> getSuperclass();
method public synchronized java.lang.reflect.TypeVariable<java.lang.Class<T>>[] getTypeParameters();
method public boolean isAnnotation();
method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
method public boolean isAnonymousClass();
method public boolean isArray();
method public boolean isAssignableFrom(java.lang.Class<?>);
@@ -51172,10 +51168,10 @@ package java.lang {
public class Package implements java.lang.reflect.AnnotatedElement {
method public A getAnnotation(java.lang.Class<A>);
method public java.lang.annotation.Annotation[] getAnnotations();
method public T[] getAnnotationsByType(java.lang.Class<T>);
method public java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>);
method public A[] getAnnotationsByType(java.lang.Class<A>);
method public A getDeclaredAnnotation(java.lang.Class<A>);
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public T[] getDeclaredAnnotationsByType(java.lang.Class<T>);
method public A[] getDeclaredAnnotationsByType(java.lang.Class<A>);
method public java.lang.String getImplementationTitle();
method public java.lang.String getImplementationVendor();
method public java.lang.String getImplementationVersion();
@@ -51185,7 +51181,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<? extends java.lang.annotation.Annotation>);
method public boolean isCompatibleWith(java.lang.String) throws java.lang.NumberFormatException;
method public boolean isSealed();
method public boolean isSealed(java.net.URL);
@@ -51854,12 +51849,8 @@ package java.lang.reflect {
ctor protected AccessibleObject();
method public T getAnnotation(java.lang.Class<T>);
method public java.lang.annotation.Annotation[] getAnnotations();
method public T[] getAnnotationsByType(java.lang.Class<T>);
method public java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>);
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public T[] getDeclaredAnnotationsByType(java.lang.Class<T>);
method public boolean isAccessible();
method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
method public static void setAccessible(java.lang.reflect.AccessibleObject[], boolean) throws java.lang.SecurityException;
method public void setAccessible(boolean) throws java.lang.SecurityException;
}
@@ -51867,11 +51858,11 @@ package java.lang.reflect {
public abstract interface AnnotatedElement {
method public abstract T getAnnotation(java.lang.Class<T>);
method public abstract java.lang.annotation.Annotation[] getAnnotations();
method public abstract T[] getAnnotationsByType(java.lang.Class<T>);
method public abstract java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>);
method public default T[] getAnnotationsByType(java.lang.Class<T>);
method public default java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>);
method public abstract java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public abstract T[] getDeclaredAnnotationsByType(java.lang.Class<T>);
method public abstract boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
method public default T[] getDeclaredAnnotationsByType(java.lang.Class<T>);
method public default boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
}
public final class Array {
@@ -51934,6 +51925,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<? extends java.lang.annotation.Annotation>);
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;

View File

@@ -53895,16 +53895,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<A>);
method public java.lang.annotation.Annotation[] getAnnotations();
method public T[] getAnnotationsByType(java.lang.Class<T>);
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 T getDeclaredAnnotation(java.lang.Class<T>);
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public T[] getDeclaredAnnotationsByType(java.lang.Class<T>);
method public java.lang.Class<?>[] getDeclaredClasses();
method public java.lang.reflect.Constructor<T> getDeclaredConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
method public java.lang.reflect.Constructor<?>[] getDeclaredConstructors() throws java.lang.SecurityException;
@@ -53935,7 +53932,6 @@ package java.lang {
method public java.lang.Class<? super T> getSuperclass();
method public synchronized java.lang.reflect.TypeVariable<java.lang.Class<T>>[] getTypeParameters();
method public boolean isAnnotation();
method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
method public boolean isAnonymousClass();
method public boolean isArray();
method public boolean isAssignableFrom(java.lang.Class<?>);
@@ -54478,10 +54474,10 @@ package java.lang {
public class Package implements java.lang.reflect.AnnotatedElement {
method public A getAnnotation(java.lang.Class<A>);
method public java.lang.annotation.Annotation[] getAnnotations();
method public T[] getAnnotationsByType(java.lang.Class<T>);
method public java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>);
method public A[] getAnnotationsByType(java.lang.Class<A>);
method public A getDeclaredAnnotation(java.lang.Class<A>);
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public T[] getDeclaredAnnotationsByType(java.lang.Class<T>);
method public A[] getDeclaredAnnotationsByType(java.lang.Class<A>);
method public java.lang.String getImplementationTitle();
method public java.lang.String getImplementationVendor();
method public java.lang.String getImplementationVersion();
@@ -54491,7 +54487,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<? extends java.lang.annotation.Annotation>);
method public boolean isCompatibleWith(java.lang.String) throws java.lang.NumberFormatException;
method public boolean isSealed();
method public boolean isSealed(java.net.URL);
@@ -55160,12 +55155,8 @@ package java.lang.reflect {
ctor protected AccessibleObject();
method public T getAnnotation(java.lang.Class<T>);
method public java.lang.annotation.Annotation[] getAnnotations();
method public T[] getAnnotationsByType(java.lang.Class<T>);
method public java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>);
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public T[] getDeclaredAnnotationsByType(java.lang.Class<T>);
method public boolean isAccessible();
method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
method public static void setAccessible(java.lang.reflect.AccessibleObject[], boolean) throws java.lang.SecurityException;
method public void setAccessible(boolean) throws java.lang.SecurityException;
}
@@ -55173,11 +55164,11 @@ package java.lang.reflect {
public abstract interface AnnotatedElement {
method public abstract T getAnnotation(java.lang.Class<T>);
method public abstract java.lang.annotation.Annotation[] getAnnotations();
method public abstract T[] getAnnotationsByType(java.lang.Class<T>);
method public abstract java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>);
method public default T[] getAnnotationsByType(java.lang.Class<T>);
method public default java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>);
method public abstract java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public abstract T[] getDeclaredAnnotationsByType(java.lang.Class<T>);
method public abstract boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
method public default T[] getDeclaredAnnotationsByType(java.lang.Class<T>);
method public default boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
}
public final class Array {
@@ -55240,6 +55231,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<? extends java.lang.annotation.Annotation>);
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;