Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc1cf387 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Fix AnnotatedElement.getDeclaredAnnotation() generic signature" am: bd32321b 

am: 125a273e

Change-Id: Ice4b08c827c8c6f0c89f578283d69685b3621e98
parents de1db617 125a273e

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -51846,7 +51846,7 @@ package java.lang.reflect { 
    method public abstract <T extends java.lang.annotation.Annotation> T getAnnotation(java.lang.Class<T>);

    method public abstract java.lang.annotation.Annotation[] getAnnotations();

    method public default <T extends java.lang.annotation.Annotation> T[] getAnnotationsByType(java.lang.Class<T>);

    method public default <T extends java.lang.annotation.Annotation> java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>);

    method public default <T extends java.lang.annotation.Annotation> T getDeclaredAnnotation(java.lang.Class<T>);

    method public abstract java.lang.annotation.Annotation[] getDeclaredAnnotations();

    method public default <T extends java.lang.annotation.Annotation> T[] getDeclaredAnnotationsByType(java.lang.Class<T>);

    method public default boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -55203,7 +55203,7 @@ package java.lang.reflect { 
    method public abstract <T extends java.lang.annotation.Annotation> T getAnnotation(java.lang.Class<T>);

    method public abstract java.lang.annotation.Annotation[] getAnnotations();

    method public default <T extends java.lang.annotation.Annotation> T[] getAnnotationsByType(java.lang.Class<T>);

    method public default <T extends java.lang.annotation.Annotation> java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>);

    method public default <T extends java.lang.annotation.Annotation> T getDeclaredAnnotation(java.lang.Class<T>);

    method public abstract java.lang.annotation.Annotation[] getDeclaredAnnotations();

    method public default <T extends java.lang.annotation.Annotation> T[] getDeclaredAnnotationsByType(java.lang.Class<T>);

    method public default boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -51926,7 +51926,7 @@ package java.lang.reflect { 
    method public abstract <T extends java.lang.annotation.Annotation> T getAnnotation(java.lang.Class<T>);

    method public abstract java.lang.annotation.Annotation[] getAnnotations();

    method public default <T extends java.lang.annotation.Annotation> T[] getAnnotationsByType(java.lang.Class<T>);

    method public default <T extends java.lang.annotation.Annotation> java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>);

    method public default <T extends java.lang.annotation.Annotation> T getDeclaredAnnotation(java.lang.Class<T>);

    method public abstract java.lang.annotation.Annotation[] getDeclaredAnnotations();

    method public default <T extends java.lang.annotation.Annotation> T[] getDeclaredAnnotationsByType(java.lang.Class<T>);

    method public default boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);