- @@ -508,23 +494,15 @@ if:subcount(class.subclasses.direct) && !class.subclasses.hidden ?> if:cl.deprecatedsince ?> data-version-deprecated="" > - From - -


-    
-

+ +

+ From + + + + +

- -

@@ -544,7 +522,7 @@ if:subcount(class.subclasses.direct) && !class.subclasses.hidden ?> - +

@@ -555,23 +533,15 @@ if:subcount(class.subclasses.direct) && !class.subclasses.hidden ?> if:cl.deprecatedsince ?> data-version-deprecated="" > - @@ -618,7 +588,7 @@ if:subcount(class.subclasses.direct) && !class.subclasses.hidden ?> -

Inherited fields

From - -


-    
-

+ From + + + + +

@@ -629,30 +599,23 @@ if:subcount(class.subclasses.direct) && !class.subclasses.hidden ?> if:cl.deprecatedsince ?> data-version-deprecated="" > -

Inherited methods

From - -


-  
-    
-  
-    
-  
-    
-  
-

- + diff --git a/res/assets/templates-sdk/page_info.cs b/res/assets/templates-sdk/page_info.cs index 3b7fbc4..8585ee1 100644 --- a/res/assets/templates-sdk/page_info.cs +++ b/res/assets/templates-sdk/page_info.cs @@ -108,7 +108,6 @@ Summary: | Inherited Methods -| [Expand All] -

Related XML Attributes:

@@ -395,7 +395,7 @@ def:class_link_table(classes) ?> -


-      data-version-added=""data-version-added="" data-version-deprecated=""
 
 
-


-      data-version-added=""data-version-added="" data-version-deprecated=""
 
     
-


-        data-version-added=""data-version-added="" data-version-deprecated=""
 
     
-


-        data-version-added=""data-version-added="" data-version-deprecated=""
 
   
-


-        data-version-added=""data-version-added="" data-version-deprecated=""
 
 
-
-
-
-
-
-     data-version-added=""data-version-added="" data-version-deprecated="" >
-    
+    
     
       
       
@@ -196,17 +191,14 @@
 
 
 
-
-
-
-
-     data-version-added=""data-version-added="" data-version-deprecated="">
-    
+    
     
       
       
@@ -226,9 +218,7 @@
 
 
 
-
-
-
+
 
 
 
@@ -267,9 +257,9 @@
 
 
 
-
-     data-version-added=""data-version-added="" data-version-deprecated=""


-    data-version-added=""data-version-added="" data-version-deprecated=""


-      data-version-added=""data-version-added="" data-version-deprecated=""


-      data-version-added=""data-version-added="" data-version-deprecated=""


-      data-version-added=""data-version-added="" data-version-deprecated=""


-    data-version-added=""data-version-added="" data-version-deprecated=""These are the API classes. See all
 API packages.
 
-
-      
-
-

+ From +

+ +

Inherited XML attributes

Enum values

Inherited constants

Inherited fields

Inherited methods


-            data-version-added=""data-version-added="" data-version-deprecated=""
       {% setvar book_path %}/reference//_book.yaml{% endsetvar %}
-    {% include "_shared/_reference-head-tags.html" %}
-    
     
     
     
-


-          data-version-added=""data-version-added="" data-version-deprecated=""
 
 
-
-     data-version-added=""data-version-added="" data-version-deprecated=""API classes.

data-version-added="" data-version-deprecated="" >


diff --git a/res/assets/templates/macros.cs b/res/assets/templates/macros.cs
index 6590b51..13a884f 100644
--- a/res/assets/templates/macros.cs
+++ b/res/assets/templates/macros.cs
@@ -393,7 +393,13 @@ def:class_link_table(classes) ?>

data-version-added="" data-version-deprecated="" >


-          
 class="selected">


-    
 class="selected">
 
diff --git a/src/com/google/doclava/MemberInfo.java b/src/com/google/doclava/MemberInfo.java
index 797b1b9..2854ab5 100644
--- a/src/com/google/doclava/MemberInfo.java
+++ b/src/com/google/doclava/MemberInfo.java
@@ -59,7 +59,7 @@ public abstract class MemberInfo extends DocInfo implements Comparable, Scoped {
 
   public String anchor() {
     if (mSignature != null) {
-      return mName + mSignature;
+      return mName + mSignature.replace(" ", "%20");
     } else {
       return mName;
     }
-- 
cgit v1.2.3


From 0e1bc95ab577bce26281b4a65332df1a4620cd89 Mon Sep 17 00:00:00 2001
From: Jeff Gaston 
Date: Fri, 22 Jun 2018 13:08:12 -0400
Subject: Clear error when building with java 9

Bug: 71711403
Test: ./gradlew && echo ok
Test: JAVA_HOME=/path/to/java9 ./gradlew && echo failed
Change-Id: Id8cb5e00bfdbb24422ec19a7558ffb54754af4da
---
 build.gradle | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/build.gradle b/build.gradle
index 106d916..083381f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,6 +22,13 @@ apply plugin: 'maven'
 group = 'com.android'
 version = '1.0.6'
 
+def currentJvmVersion = org.gradle.api.JavaVersion.current()
+if (currentJvmVersion.getMajorVersion() != "8") {
+  throw new Exception("Unsupported java version '" + currentJvmVersion.toString() + "'. Please install java 8.\n" +
+"\n" +
+"If you have already installed java 8, you can instruct Gradle to use it by setting the environment variable JAVA_HOME equal to its file path.")
+}
+
 /*
  * With the build server you are given two env variables:
  * 1. The OUT_DIR is a temporary directory you can use to put things during the build.
-- 
cgit v1.2.3


From bd9dbeee4e2e17267ca71aae417b2cb58a0eb8cc Mon Sep 17 00:00:00 2001
From: Justin McClain 
Date: Mon, 18 Jun 2018 09:49:08 -0700
Subject: Add -keepstubcomments flag to Doclava.

When running Doclava with -stubs, documentation is stripped from the
outputted jar. So, updating Doclava to allow documentation to be kept
in stubbed output using -keepstubcomments flag. The flag is false by
default will not cause any change to current functionality.

Bug: 30225177
Test: manual - verification of outputted jar with new flag.
Change-Id: I87fd580bce5910142d05503c55f57f7d9ddcab1a
---
 src/com/google/doclava/Doclava.java |  8 +++++-
 src/com/google/doclava/Stubs.java   | 49 ++++++++++++++++++++++++++-----------
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/src/com/google/doclava/Doclava.java b/src/com/google/doclava/Doclava.java
index 460c573..fe63038 100644
--- a/src/com/google/doclava/Doclava.java
+++ b/src/com/google/doclava/Doclava.java
@@ -195,6 +195,7 @@ public class Doclava {
     HashSet stubPackages = null;
     HashSet stubImportPackages = null;
     boolean stubSourceOnly = false;
+    boolean keepStubComments = false;
     ArrayList knownTagsFiles = new ArrayList();
 
     root = r;
@@ -303,6 +304,8 @@ public class Doclava {
         }
       } else if (a[0].equals("-stubsourceonly")) {
         stubSourceOnly = true;
+      } else if (a[0].equals("-keepstubcomments")) {
+        keepStubComments = true;
       } else if (a[0].equals("-sdkvalues")) {
         sdkValuePath = a[1];
       } else if (a[0].equals("-api")) {
@@ -577,7 +580,7 @@ public class Doclava {
         || privateApiFile != null || privateDexApiFile != null || apiMappingFile != null) {
       Stubs.writeStubsAndApi(stubsDir, apiFile, dexApiFile, proguardFile, removedApiFile,
           removedDexApiFile, exactApiFile, privateApiFile, privateDexApiFile, apiMappingFile,
-          stubPackages, stubImportPackages, stubSourceOnly);
+          stubPackages, stubImportPackages, stubSourceOnly, keepStubComments);
     }
 
     Errors.printErrors();
@@ -866,6 +869,9 @@ public class Doclava {
     if (option.equals("-stubsourceonly")) {
       return 1;
     }
+    if (option.equals("-keepstubcomments")) {
+      return 1;
+    }
     if (option.equals("-sdkvalues")) {
       return 2;
     }
diff --git a/src/com/google/doclava/Stubs.java b/src/com/google/doclava/Stubs.java
index 0ef3749..930d52c 100644
--- a/src/com/google/doclava/Stubs.java
+++ b/src/com/google/doclava/Stubs.java
@@ -49,7 +49,8 @@ public class Stubs {
   public static void writeStubsAndApi(String stubsDir, String apiFile, String dexApiFile,
       String keepListFile, String removedApiFile, String removedDexApiFile, String exactApiFile,
       String privateApiFile, String privateDexApiFile, String apiMappingFile,
-      HashSet stubPackages, HashSet stubImportPackages, boolean stubSourceOnly) {
+      HashSet stubPackages, HashSet stubImportPackages, boolean stubSourceOnly,
+      boolean keepStubComments) {
     // figure out which classes we need
     final HashSet notStrippable = new HashSet();
     Collection all = Converter.allClasses();
@@ -259,7 +260,7 @@ public class Stubs {
         if (shouldWriteStub(cl.containingPackage().name(), stubPackages, stubPackageWildcards)) {
           // write out the stubs
           if (stubsDir != null) {
-            writeClassFile(stubsDir, notStrippable, cl);
+            writeClassFile(stubsDir, notStrippable, cl, keepStubComments);
           }
           // build class list for api file or keep list file
           if (apiWriter != null || dexApiWriter != null || keepListWriter != null) {
@@ -588,7 +589,7 @@ public class Stubs {
     return dir + cl.name() + ".java";
   }
 
-  static void writeClassFile(String stubsDir, HashSet notStrippable, ClassInfo cl) {
+  static void writeClassFile(String stubsDir, HashSet notStrippable, ClassInfo cl, boolean keepStubComments) {
     // inner classes are written by their containing class
     if (cl.containingClass() != null) {
       return;
@@ -608,7 +609,7 @@ public class Stubs {
     PrintStream stream = null;
     try {
       stream = new PrintStream(new BufferedOutputStream(new FileOutputStream(file)));
-      writeClassFile(stream, notStrippable, cl);
+      writeClassFile(stream, notStrippable, cl, keepStubComments);
     } catch (FileNotFoundException e) {
       System.err.println("error writing file: " + filename);
     } finally {
@@ -618,7 +619,7 @@ public class Stubs {
     }
   }
 
-  static void writeClassFile(PrintStream stream, HashSet notStrippable, ClassInfo cl) {
+  static void writeClassFile(PrintStream stream, HashSet notStrippable, ClassInfo cl, boolean keepStubComments) {
     PackageInfo pkg = cl.containingPackage();
     if (cl.containingClass() == null) {
         stream.print(parseLicenseHeader(cl.position()));
@@ -626,7 +627,7 @@ public class Stubs {
     if (pkg != null) {
       stream.println("package " + pkg.name() + ";");
     }
-    writeClass(stream, notStrippable, cl);
+    writeClass(stream, notStrippable, cl, keepStubComments);
   }
 
   private static String parseLicenseHeader(/* @Nonnull */ SourcePositionInfo positionInfo) {
@@ -677,7 +678,11 @@ public class Stubs {
     return builder.toString();
   }
 
-  static void writeClass(PrintStream stream, HashSet notStrippable, ClassInfo cl) {
+  static void writeClass(PrintStream stream, HashSet notStrippable, ClassInfo cl, boolean keepStubComments) {
+    if (keepStubComments) {
+      writeComment(stream, cl);
+    }
+
     writeAnnotations(stream, cl.annotations(), cl.isDeprecated());
 
     stream.print(cl.scope() + " ");
@@ -752,14 +757,14 @@ public class Stubs {
 
     for (ClassInfo inner : cl.getRealInnerClasses()) {
       if (notStrippable.contains(inner) && !inner.isDocOnly()) {
-        writeClass(stream, notStrippable, inner);
+        writeClass(stream, notStrippable, inner, keepStubComments);
       }
     }
 
 
     for (MethodInfo method : cl.constructors()) {
       if (!method.isDocOnly()) {
-        writeMethod(stream, method, true);
+        writeMethod(stream, method, true, keepStubComments);
       }
     }
 
@@ -806,7 +811,7 @@ public class Stubs {
         }
       }
       if (!method.isDocOnly()) {
-        writeMethod(stream, method, false);
+        writeMethod(stream, method, false, keepStubComments);
       }
     }
     // Write all methods that are hidden or removed, but override abstract methods or interface methods.
@@ -823,7 +828,7 @@ public class Stubs {
           (overriddenMethod.isAbstract() || overriddenMethod.containingClass().isInterface())) {
         method.setReason("1:" + classContainingMethod.qualifiedName());
         cl.addMethod(method);
-        writeMethod(stream, method, false);
+        writeMethod(stream, method, false, keepStubComments);
       }
     }
 
@@ -835,7 +840,7 @@ public class Stubs {
 
     for (FieldInfo field : cl.selfFields()) {
       if (!field.isDocOnly()) {
-        writeField(stream, field);
+        writeField(stream, field, keepStubComments);
       }
     }
 
@@ -853,7 +858,10 @@ public class Stubs {
     stream.println("}");
   }
 
-  static void writeMethod(PrintStream stream, MethodInfo method, boolean isConstructor) {
+  static void writeMethod(PrintStream stream, MethodInfo method, boolean isConstructor, boolean keepStubComments) {
+    if (keepStubComments) {
+      writeComment(stream, method);
+    }
     String comma;
 
     writeAnnotations(stream, method.annotations(), method.isDeprecated());
@@ -924,7 +932,10 @@ public class Stubs {
     }
   }
 
-  static void writeField(PrintStream stream, FieldInfo field) {
+  static void writeField(PrintStream stream, FieldInfo field, boolean keepStubComments) {
+    if (keepStubComments) {
+      writeComment(stream, field);
+    }
     writeAnnotations(stream, field.annotations(), field.isDeprecated());
 
     stream.print(field.scope() + " ");
@@ -1090,6 +1101,16 @@ public class Stubs {
     stream.println(";");
   }
 
+  static void writeComment(PrintStream stream, DocInfo doc) {
+    if (!doc.isHiddenOrRemoved() && !doc.comment().isDocOnly() && !"".equals(doc.getRawCommentText())) {
+      String newLineSeparator = System.getProperty("line.separator");
+      stream.println("/**");
+      stream.print(" * ");
+      stream.println(doc.getRawCommentText().replace(newLineSeparator, newLineSeparator + " *"));
+      stream.println(" */");
+    }
+  }
+
   public static void writeXml(PrintStream xmlWriter, Collection pkgs, boolean strip) {
     if (strip) {
       Stubs.writeXml(xmlWriter, pkgs);
-- 
cgit v1.2.3


From 1b9c8b9f21daf4844d64da582522190335390b56 Mon Sep 17 00:00:00 2001
From: Aurimas Liutikas 
Date: Mon, 16 Jul 2018 15:13:55 -0700
Subject: Make doclava look at prebuilts in a new location.

Test: ./gradlew buildOnServer for AndroidX
Change-Id: I1e587ca2e254e4dd5718cf47c50b94d44b06bfc6
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 083381f..3096e0e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,7 +54,7 @@ if (System.env.DIST_DIR != null && System.env.OUT_DIR != null) {
  * If prebuilts are available, use them. Else, if this is unbundled build use jcenter().
  * Finally, if none of that is true, attempt to compile against the full source trees.
  */
-File m2repo = file('../../prebuilts/tools/common/m2/repository')
+File m2repo = file('../../prebuilts/androidx/external')
 boolean unbundleBuild = (new File("unbundled-build")).exists()
 
 if (m2repo.exists() || unbundleBuild) {
-- 
cgit v1.2.3


From 498f399c1c212fb1fec764dea3dbf901a4ff1c5d Mon Sep 17 00:00:00 2001
From: Jeff Sharkey 
Date: Wed, 17 Oct 2018 06:36:12 -0600
Subject: Try fixing expandable issue.

Bug: 78064247
Test: none
Change-Id: Ic43172d135b26698192144b6c6f8e070bb318886
---
 res/assets/templates-sdk/assets/css/default.css | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/res/assets/templates-sdk/assets/css/default.css b/res/assets/templates-sdk/assets/css/default.css
index 65d7fde..2abfe73 100644
--- a/res/assets/templates-sdk/assets/css/default.css
+++ b/res/assets/templates-sdk/assets/css/default.css
@@ -2552,25 +2552,10 @@ div.design-announce p {
 }
 
 .expandable {
-  height:34px;
+  height:auto;
   padding-left:20px;
   position:relative;
 }
-.expandable:before {
-  content: '';
-  background-image: url(../images/styles/disclosure_down.png);
-  background-repeat:no-repeat;
-  background-position: -12px -9px;
-  width: 20px;
-  height: 20px;
-  display: inline-block;
-  position: absolute;
-  top: 0;
-  left: 0; }
-}
-.expandable.expanded:before {
-  background-image: url(../images/styles/disclosure_up.png);
-}
 
 /* notice box for cross links between Design/Develop docs */
 a.notice-developers-video,
-- 
cgit v1.2.3


From b2a69f98a16ec3c9f7f30fa4689bee21c038fd31 Mon Sep 17 00:00:00 2001
From: Tor Norbye 
Date: Thu, 14 Feb 2019 08:00:23 +0000
Subject: Update doclava owners

Test: gerrit uploader
Change-Id: I761ae5c4f66a256132f93f455afcc8c69ffc2b28
---
 OWNERS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OWNERS b/OWNERS
index 080f8f8..dd69424 100644
--- a/OWNERS
+++ b/OWNERS
@@ -2,3 +2,6 @@
 # Please update this list if you find better candidates.
 jsharkey@android.com
 smain@google.com # for files under res/
+ddougherty@google.com
+tiem@google.com
+tnorbye@google.com
-- 
cgit v1.2.3


From 176e9f57be142ec55556e0f4ab781df6e393c0ee Mon Sep 17 00:00:00 2001
From: Jeff Sharkey 
Date: Fri, 15 Feb 2019 13:16:35 -0700
Subject: Automatic documentation for "@Column" annotation.

We have various "contract" classes across the OS which describe the
columns that are available for insert(), update(), and query() when
working with ContentProviders.

To help ensure that the underlying providers fully support the API
contracts being made, this change defines a new "@Column" annotation
which describes the underlying data type.

These annotations can then be used by the ContentProvider
implementations internally to ensure that they're fully meeting the
API contracts being made.

Bug: 120429729
Test: manual
Change-Id: Iffeb5fce4a1186e0b4aa3424ecb69a34f6607c21
---
 res/assets/templates-sdk/macros_override.cs  | 12 +++++++++
 src/com/google/doclava/AndroidAuxSource.java | 40 ++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/res/assets/templates-sdk/macros_override.cs b/res/assets/templates-sdk/macros_override.cs
index 8ef81cf..5c0c482 100644
--- a/res/assets/templates-sdk/macros_override.cs
+++ b/res/assets/templates-sdk/macros_override.cs
@@ -68,6 +68,7 @@ def:aux_tag_list(tags) ?>
Requires the  feature which can be detected using .
+
+# Print output for @column tags ?>This constant represents a column name that can be used with a  through a  or  object. The values stored in this column are , and are read-only and cannot be mutated.
diff --git a/src/com/google/doclava/AndroidAuxSource.java b/src/com/google/doclava/AndroidAuxSource.java
index 1c97b18..ca1fbd0 100644
--- a/src/com/google/doclava/AndroidAuxSource.java
+++ b/src/com/google/doclava/AndroidAuxSource.java
@@ -219,6 +219,46 @@ public class AndroidAuxSource implements AuxSource {
             valueTags.toArray(TagInfo.getArray(valueTags.size()))));
       }
 
+      // Document provider columns
+      if ((type == TYPE_FIELD) && annotation.type().qualifiedNameMatches("android", "Column")) {
+        String value = null;
+        boolean readOnly = false;
+        for (AnnotationValueInfo val : annotation.elementValues()) {
+          switch (val.element().name()) {
+            case "value":
+              value = String.valueOf(val.value());
+              break;
+            case "readOnly":
+              readOnly = Boolean.parseBoolean(String.valueOf(val.value()));
+              break;
+          }
+        }
+
+        ArrayList valueTags = new ArrayList<>();
+        valueTags.add(new ParsedTagInfo("", "",
+            "{@link android.content.ContentProvider}", null, SourcePositionInfo.UNKNOWN));
+        valueTags.add(new ParsedTagInfo("", "",
+            "{@link android.content.ContentValues}", null, SourcePositionInfo.UNKNOWN));
+        valueTags.add(new ParsedTagInfo("", "",
+            "{@link android.database.Cursor}", null, SourcePositionInfo.UNKNOWN));
+
+        ClassInfo cursorClass = annotation.type().findClass("android.database.Cursor");
+        for (FieldInfo field : cursorClass.fields()) {
+          if (field.isHiddenOrRemoved()) continue;
+          if (String.valueOf(field.constantValue()).equals(value)) {
+            valueTags.add(new ParsedTagInfo("", "",
+                "{@link android.database.Cursor#" + field.name() + "}",
+                null, SourcePositionInfo.UNKNOWN));
+          }
+        }
+        if (valueTags.size() < 4) continue;
+
+        Map args = new HashMap<>();
+        if (readOnly) args.put("readOnly", "true");
+        tags.add(new AuxTagInfo("@column", "@column", SourcePositionInfo.UNKNOWN, args,
+            valueTags.toArray(TagInfo.getArray(valueTags.size()))));
+      }
+
       // The remaining annotations below always appear on return docs, and
       // should not be included in the method body
       if (type == TYPE_METHOD) continue;
-- 
cgit v1.2.3


From 68b84b837fd60883ac8d06c6c4f03e3dfbb61c00 Mon Sep 17 00:00:00 2001
From: Dirk Dougherty 
Date: Sat, 16 Feb 2019 12:05:24 -0800
Subject: Update doclava to use @since tags from comments.

Metalava is now generating the API stubs and handles the calculation
of when APIs were introduced and deprecated. It now directly adds this
info to each APIs comment using the tags @apiSince and
@deprecatedSince.

This cl enables the doclava API reference generator to extract these
tags and output them to the docs. Requires passing -metalavaApiSince
into the doclava build.

bug: 125939989
Test: make ds-docs

Change-Id: I1a6c04a3e05dd1dc74ccdaf81ec45b52a40f55fc
---
 res/assets/templates-sdk/page_info.cs |  7 ------
 res/assets/templates/macros.cs        | 15 +++++++++----
 src/com/google/doclava/ClassInfo.java |  1 -
 src/com/google/doclava/Comment.java   | 40 ++++++++++++++++++++++++++++++-----
 src/com/google/doclava/DocInfo.java   | 15 +++++++++++--
 src/com/google/doclava/Doclava.java   | 30 +++++++++++++++++---------
 6 files changed, 79 insertions(+), 29 deletions(-)

diff --git a/res/assets/templates-sdk/page_info.cs b/res/assets/templates-sdk/page_info.cs
index 8585ee1..5fe6f7b 100644
--- a/res/assets/templates-sdk/page_info.cs
+++ b/res/assets/templates-sdk/page_info.cs
@@ -27,13 +27,6 @@ elif:subcount(class)
   
     

   
-  
Deprecated since version 
Deprecated since
-    API level
-      
-  
   
 
 
diff --git a/res/assets/templates/macros.cs b/res/assets/templates/macros.cs
index 13a884f..db502bb 100644
--- a/res/assets/templates/macros.cs
+++ b/res/assets/templates/macros.cs
@@ -267,17 +267,24 @@ def:see_also_tags(also) ?> 0 ?>
-    added in  -1
         ?>versionAPI level 
-    Android  Developer PreviewAdded in Android 
+  
Deprecated in version 
Deprecated in
+    API level
+      
+  
diff --git a/src/com/google/doclava/Comment.java b/src/com/google/doclava/Comment.java
index 63ace55..e11e329 100644
--- a/src/com/google/doclava/Comment.java
+++ b/src/com/google/doclava/Comment.java
@@ -30,9 +30,14 @@ public class Comment {
   private static final Set KNOWN_TAGS = new HashSet(Arrays.asList(new String[] {
           "@apiNote",
           "@author",
-          "@since",
           "@version",
+          //not used by metalava for Android docs (see @apiSince)
+          "@since",
+          //value is an Android API level (set automatically by metalava)
+          "@apiSince",
           "@deprecated",
+          //value is an Android API level (set automatically by metalava)
+          "@deprecatedSince",
           "@undeprecate",
           "@docRoot",
           "@sdkCurrent",
@@ -45,8 +50,6 @@ public class Comment {
           "@implNote",
           "@implSpec",
           "@usesMathJax",
-          "@deprecatedSince",
-          "@apiSince",
       }));
 
   public Comment(String text, ContainerInfo base, SourcePositionInfo sp) {
@@ -287,8 +290,6 @@ public class Comment {
 
       for (char c = text.charAt(index);
               index < endOfBlock && !isWhitespaceChar(c); c = text.charAt(index++)) {}
-
-      //
       if (index == startOfBlock+1) {
           return;
       }
@@ -330,6 +331,10 @@ public class Comment {
       mInlineTagsList.add(new TextTagInfo("Text", "Text", text, pos));
     } else if (name.equals("@param")) {
       mParamTagsList.add(new ParamTagInfo("@param", "@param", text, mBase, pos));
+    } else if (name.equals("@apiSince")) {
+      setApiSince(text);
+    } else if (name.equals("@deprecatedSince")) {
+      setDeprecatedSince(text);
     } else if (name.equals("@see")) {
       mSeeTagsList.add(new SeeTagInfo("@see", "@see", text, mBase, pos));
     } else if (name.equals("@link")) {
@@ -526,6 +531,29 @@ public class Comment {
     return mRemoved;
   }
 
+  public void setDeprecatedSince(String since) {
+    if (since != null) {
+      since = since.trim();
+    }
+    mDeprecatedSince = since;
+  }
+
+  public String getDeprecatedSince() {
+    return mDeprecatedSince;
+  }
+
+  public void setApiSince(String since) {
+    if (since != null) {
+      since = since.trim();
+    }
+    mApiSince = since;
+  }
+
+  public String getApiSince() {
+    //return the value of @apiSince, an API level in Android
+    return mApiSince;
+  }
+
   public boolean isDocOnly() {
     if (mDocOnly == null) {
       mDocOnly = (mText != null) && (mText.indexOf("@doconly") >= 0);
@@ -601,6 +629,8 @@ public class Comment {
   Boolean mRemoved = null;
   Boolean mDocOnly = null;
   Boolean mDeprecated = null;
+  String mDeprecatedSince;
+  String mApiSince;
   String mText;
   ContainerInfo mBase;
   SourcePositionInfo mPosition;
diff --git a/src/com/google/doclava/DocInfo.java b/src/com/google/doclava/DocInfo.java
index 650ce0d..fae225f 100644
--- a/src/com/google/doclava/DocInfo.java
+++ b/src/com/google/doclava/DocInfo.java
@@ -101,6 +101,9 @@ public abstract class DocInfo {
   }
 
   public String getSince() {
+    if (Doclava.METALAVA_API_SINCE) {
+      mSince = comment().getApiSince();
+    }
     return mSince;
   }
 
@@ -129,11 +132,19 @@ public abstract class DocInfo {
   }
 
   public String getDeprecatedSince() {
-    return mDeprecatedSince;
+    if (Doclava.METALAVA_API_SINCE) {
+        return comment().getDeprecatedSince();
+    } else {
+        return mDeprecatedSince;
+    }
   }
 
   public boolean isDeprecated() {
-    return mDeprecatedSince != null ? true : false;
+    if (Doclava.METALAVA_API_SINCE) {
+      return comment().isDeprecated();
+    } else {
+      return mDeprecatedSince != null ? true : false;
+    }
   }
 
   public final void addFederatedReference(FederatedSite source) {
diff --git a/src/com/google/doclava/Doclava.java b/src/com/google/doclava/Doclava.java
index 564f104..f24718a 100644
--- a/src/com/google/doclava/Doclava.java
+++ b/src/com/google/doclava/Doclava.java
@@ -82,6 +82,7 @@ public class Doclava {
   public static boolean NAVTREE_ONLY = false;
   /* Generate reference navtree.js with all inherited members */
   public static boolean AT_LINKS_NAVTREE = false;
+  public static boolean METALAVA_API_SINCE = false;
   public static String outputPathBase = "/";
   public static ArrayList inputPathHtmlDirs = new ArrayList();
   public static ArrayList inputPathHtmlDir2 = new ArrayList();
@@ -331,6 +332,8 @@ public class Doclava {
         includeDefaultAssets = false;
       } else if (a[0].equals("-parsecomments")) {
         parseComments = true;
+      } else if (a[0].equals("-metalavaApiSince")) {
+        METALAVA_API_SINCE = true;
       } else if (a[0].equals("-since")) {
         sinceTagger.addVersion(a[1], a[2]);
       } else if (a[0].equals("-artifact")) {
@@ -528,6 +531,15 @@ public class Doclava {
           refPrefix = "gcm-";
         }
 
+        // Packages Pages
+        writePackages(refPrefix + "packages" + htmlExtension);
+
+        // Classes
+        writeClassLists();
+        writeClasses();
+        writeHierarchy();
+        // writeKeywords();
+
         // Write yaml tree.
         if (yamlNavFile != null) {
           if (yamlV2) {
@@ -542,15 +554,6 @@ public class Doclava {
           NavTree.writeNavTree(javadocDir, refPrefix);
         }
 
-        // Packages Pages
-        writePackages(refPrefix + "packages" + htmlExtension);
-
-        // Classes
-        writeClassLists();
-        writeClasses();
-        writeHierarchy();
-        // writeKeywords();
-
         // Lists for JavaScript
         writeLists();
         if (keepListFile != null) {
@@ -903,6 +906,9 @@ public class Doclava {
     if (option.equals("-parsecomments")) {
       return 1;
     }
+    if (option.equals("-metalavaApiSince")) {
+      return 1;
+    }
     if (option.equals("-since")) {
       return 3;
     }
@@ -1054,7 +1060,11 @@ public class Doclava {
           data.setValue("reference.gcm", "true");
       }
       data.setValue("reference", "1");
-      data.setValue("reference.apilevels", sinceTagger.hasVersions() ? "1" : "0");
+      if (METALAVA_API_SINCE) {
+        data.setValue("reference.apilevels", (pkg.getSince() != null) ? "1" : "0");
+      } else {
+        data.setValue("reference.apilevels", sinceTagger.hasVersions() ? "1" : "0");
+      }
       data.setValue("reference.artifacts", artifactTagger.hasArtifacts() ? "1" : "0");
       data.setValue("docs.packages." + i + ".name", s);
       data.setValue("docs.packages." + i + ".link", pkg.htmlPage());
-- 
cgit v1.2.3


From 52050d57f1a63de2e6d644d55047c8574184a26c Mon Sep 17 00:00:00 2001
From: Andrea Falcone 
Date: Tue, 9 Jul 2019 17:17:38 -0400
Subject: Ignore tags in comments that are actually Java annotations

BUG: 135928616
TEST: ./gradlew tipOfTreeDocsTask
Change-Id: I8fcf99e144ff3d08de8ec30977b8042b3e87eef0
---
 src/com/google/doclava/Comment.java | 12 ++++++++++--
 src/com/google/doclava/Errors.java  |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/com/google/doclava/Comment.java b/src/com/google/doclava/Comment.java
index 63ace55..ea09788 100644
--- a/src/com/google/doclava/Comment.java
+++ b/src/com/google/doclava/Comment.java
@@ -387,8 +387,16 @@ public class Comment {
         known = Doclava.knownTags.contains(name);
       }
       if (!known) {
-        Errors.error(Errors.UNKNOWN_TAG, pos == null ? null : new SourcePositionInfo(pos),
-            "Unknown tag: " + name);
+          if (name.length() >= 2 && Character.isUpperCase(name.charAt(1))) {
+              // This is a workaround for b/135928616 where parsing of comments fails when there is
+              // a Java annotation and not a tag.
+              Errors.error(Errors.JAVA_TAG_IN_COMMENT,
+                      pos == null ? null : new SourcePositionInfo(pos),
+                      "Invalid tag: " + name);
+          } else {
+              Errors.error(Errors.UNKNOWN_TAG, pos == null ? null : new SourcePositionInfo(pos),
+                      "Unknown tag: " + name);
+          }
       }
       TagInfo t = new TextTagInfo(name, name, text, pos);
       if (isInline) {
diff --git a/src/com/google/doclava/Errors.java b/src/com/google/doclava/Errors.java
index 6b0eee0..a7a3bdf 100644
--- a/src/com/google/doclava/Errors.java
+++ b/src/com/google/doclava/Errors.java
@@ -314,6 +314,7 @@ public class Errors {
   public static final Error TODO = new Error(128, LINT);
   public static final Error NO_ARTIFACT_DATA = new Error(129, HIDDEN);
   public static final Error BROKEN_ARTIFACT_FILE = new Error(130, ERROR);
+  public static final Error JAVA_TAG_IN_COMMENT = new Error(131, LINT);
 
   public static boolean setErrorLevel(int code, int level) {
     for (Error e : sErrors) {
-- 
cgit v1.2.3