Merge "Allow class kind to be used in AnnotationTypeDoc" into main am: b0cd698af8

Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/2952808

Change-Id: I516c3128354574870ae6c1d6f5fc3346198a2930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/doclet_adapter/src/main/java/com/google/doclava/javadoc/AnnotationTypeDocImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/AnnotationTypeDocImpl.java
index 58bfdfe..6c85c0f 100644
--- a/doclet_adapter/src/main/java/com/google/doclava/javadoc/AnnotationTypeDocImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/AnnotationTypeDocImpl.java
@@ -43,9 +43,9 @@ class AnnotationTypeDocImpl extends ClassDocImpl implements AnnotationTypeDoc {
     private AnnotationTypeElementDoc[] elements;
 
     static AnnotationTypeDocImpl create(TypeElement e, Context context) {
-        if (e.getKind() != ElementKind.ANNOTATION_TYPE) {
-            throw new IllegalArgumentException("Expected ElementKind.ANNOTATION_TYPE as first "
-                    + "argument, but got " + e.getKind());
+        if (e.getKind() != ElementKind.ANNOTATION_TYPE && e.getKind() != ElementKind.CLASS) {
+            throw new IllegalArgumentException("Expected ElementKind.ANNOTATION_TYPE or "
+                    + "ElementKind.CLASS as first argument, but got " + e.getKind());
         }
         return context.caches.annotations.computeIfAbsent(e, el -> new AnnotationTypeDocImpl(el,
                 context));