release-request-7d12f16b-b4a7-4324-8b59-be2d4e07dcb3-for-git_oc-release-4094438 snap-temp-L80000000073561277android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-cts-release

Change-Id: Iba38d0b22b81234c054c86e5ce138e7252c5bb41

3 files changed, 31 insertions, 9 deletions

diff --git a/src/com/google/doclava/AndroidAuxSource.java b/src/com/google/doclava/AndroidAuxSource.java
index d006af0..8ed9fb0 100644
--- a/src/com/google/doclava/AndroidAuxSource.java
+++ b/src/com/google/doclava/AndroidAuxSource.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 public class AndroidAuxSource implements AuxSource {
   private static final int TYPE_FIELD = 0;
@@ -77,31 +78,44 @@ public class AndroidAuxSource implements AuxSource {
   @Override
   public TagInfo[] fieldAuxTags(FieldInfo field) {
     if (hasSuppress(field)) return TagInfo.EMPTY_ARRAY;
-    return auxTags(TYPE_FIELD, field.annotations());
+    return auxTags(TYPE_FIELD, field.annotations(), toString(field.inlineTags()));
   }
 
   @Override
   public TagInfo[] methodAuxTags(MethodInfo method) {
     if (hasSuppress(method)) return TagInfo.EMPTY_ARRAY;
-    return auxTags(TYPE_METHOD, method.annotations());
+    return auxTags(TYPE_METHOD, method.annotations(), toString(method.inlineTags().tags()));
   }
 
   @Override
-  public TagInfo[] paramAuxTags(MethodInfo method, ParameterInfo param) {
+  public TagInfo[] paramAuxTags(MethodInfo method, ParameterInfo param, String comment) {
     if (hasSuppress(method)) return TagInfo.EMPTY_ARRAY;
     if (hasSuppress(param.annotations())) return TagInfo.EMPTY_ARRAY;
-    return auxTags(TYPE_PARAM, param.annotations());
+    return auxTags(TYPE_PARAM, param.annotations(), new String[] { comment });
   }
 
   @Override
   public TagInfo[] returnAuxTags(MethodInfo method) {
     if (hasSuppress(method)) return TagInfo.EMPTY_ARRAY;
-    return auxTags(TYPE_RETURN, method.annotations());
+    return auxTags(TYPE_RETURN, method.annotations(), toString(method.returnTags().tags()));
   }
 
-  private static TagInfo[] auxTags(int type, List<AnnotationInstanceInfo> annotations) {
+  private static TagInfo[] auxTags(int type, List<AnnotationInstanceInfo> annotations,
+      String[] comment) {
     ArrayList<TagInfo> tags = new ArrayList<>();
     for (AnnotationInstanceInfo annotation : annotations) {
+      // Ignore null-related annotations when docs already mention
+      if (annotation.type().qualifiedNameMatches("android", "annotation.NonNull")
+          || annotation.type().qualifiedNameMatches("android", "annotation.Nullable")) {
+        boolean mentionsNull = false;
+        for (String c : comment) {
+          mentionsNull |= Pattern.compile("\\bnull\\b").matcher(c).find();
+        }
+        if (mentionsNull) {
+          continue;
+        }
+      }
+
       // Blindly include docs requested by annotations
       ParsedTagInfo[] docTags = ParsedTagInfo.EMPTY_ARRAY;
       switch (type) {
@@ -238,6 +252,14 @@ public class AndroidAuxSource implements AuxSource {
     return tags.toArray(TagInfo.getArray(tags.size()));
   }
 
+  private static String[] toString(TagInfo[] tags) {
+    final String[] res = new String[tags.length];
+    for (int i = 0; i < res.length; i++) {
+      res[i] = tags[i].text();
+    }
+    return res;
+  }
+
   private static boolean hasSuppress(MemberInfo member) {
     return hasSuppress(member.annotations())
         || hasSuppress(member.containingClass().annotations());
diff --git a/src/com/google/doclava/AuxSource.java b/src/com/google/doclava/AuxSource.java
index 03594f5..df03546 100644
--- a/src/com/google/doclava/AuxSource.java
+++ b/src/com/google/doclava/AuxSource.java
@@ -20,7 +20,7 @@ public interface AuxSource {
   public TagInfo[] classAuxTags(ClassInfo clazz);
   public TagInfo[] fieldAuxTags(FieldInfo field);
   public TagInfo[] methodAuxTags(MethodInfo method);
-  public TagInfo[] paramAuxTags(MethodInfo method, ParameterInfo param);
+  public TagInfo[] paramAuxTags(MethodInfo method, ParameterInfo param, String comment);
   public TagInfo[] returnAuxTags(MethodInfo method);
 }
 
@@ -41,7 +41,7 @@ class EmptyAuxSource implements AuxSource {
   }
 
   @Override
-  public TagInfo[] paramAuxTags(MethodInfo method, ParameterInfo param) {
+  public TagInfo[] paramAuxTags(MethodInfo method, ParameterInfo param, String comment) {
     return TagInfo.EMPTY_ARRAY;
   }
 
diff --git a/src/com/google/doclava/MethodInfo.java b/src/com/google/doclava/MethodInfo.java
index 5ed58eb..47b1978 100644
--- a/src/com/google/doclava/MethodInfo.java
+++ b/src/com/google/doclava/MethodInfo.java
@@ -513,7 +513,7 @@ public class MethodInfo extends MemberInfo implements AbstractMethodInfo, Resolv
         }
 
         // Collect all docs requested by annotations
-        TagInfo[] auxTags = Doclava.auxSource.paramAuxTags(this, param);
+        TagInfo[] auxTags = Doclava.auxSource.paramAuxTags(this, param, comment);
 
         // Okay, now add the collected parameter information to the method data
         mParamTags[i] =