| commit | a706b970614e544f345367334ba2fea20002d422 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Feb 07 10:52:26 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 07 10:52:26 2024 +0000 |
| tree | f0e82ef9b956a3c38fe94bdfa5d6013577541860 | |
| parent | 4642eb719b7d7440d3cc1d507b63188c444bc56c [diff] | |
| parent | b0cd698af82698341760799aea703ea199eb87a8 [diff] |
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>
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 @@ 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));