Merge "Snap for 6826413 from 6ec83c725892e17e327e1480c1781a89964b7118 to androidx-camerax-release" into androidx-camerax-releaseandroidx-camerax-release

4 files changed, 11 insertions, 25 deletions

diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: NOTICE
+}
diff --git a/build.gradle b/build.gradle
index 7cd0f09..bb0ff5f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -121,3 +121,8 @@ task dist(type: Zip, dependsOn: uploadArchives)  {
         logger.lifecycle "Compressed maven artifacts to ${archivePath}"
     }
 }
+
+tasks.withType(JavaCompile) {
+    // Suppress build warnings that we're not interested in: b/154755010
+    options.warnings = false
+}
diff --git a/src/com/google/doclava/Converter.java b/src/com/google/doclava/Converter.java
index a6f803b..cf14237 100644
--- a/src/com/google/doclava/Converter.java
+++ b/src/com/google/doclava/Converter.java
@@ -501,23 +501,9 @@ public class Converter {
         return result;
       } else {
         ConstructorDoc m = (ConstructorDoc) o;
-        // Workaround for a JavaDoc behavior change introduced in OpenJDK 8 that breaks
-        // links in documentation and the content of API files like current.txt.
-        // http://b/18051133.
-        String name = m.name();
-        ClassDoc containingClass = m.containingClass();
-        if (containingClass.containingClass() != null) {
-          // This should detect the new behavior and be bypassed otherwise.
-          if (!name.contains(".")) {
-            // Constructors of inner classes do not contain the name of the enclosing class
-            // with OpenJDK 8. This simulates the old behavior:
-            name = containingClass.name();
-          }
-        }
-        // End of workaround.
         MethodInfo result =
             new MethodInfo(m.getRawCommentText(), new ArrayList<TypeInfo>(Arrays.asList(Converter.convertTypes(m.typeParameters()))),
-                name, m.signature(), Converter.obtainClass(m.containingClass()), Converter
+                m.name(), m.signature(), Converter.obtainClass(m.containingClass()), Converter
                 .obtainClass(m.containingClass()), m.isPublic(), m.isProtected(), m
                 .isPackagePrivate(), m.isPrivate(), m.isFinal(), m.isStatic(), m.isSynthetic(),
                 false, m.isSynchronized(), m.isNative(), false/*isDefault*/, false, "constructor", m.flatSignature(),
diff --git a/src/com/google/doclava/SeeTagInfo.java b/src/com/google/doclava/SeeTagInfo.java
index eddc595..fee8ce2 100644
--- a/src/com/google/doclava/SeeTagInfo.java
+++ b/src/com/google/doclava/SeeTagInfo.java
@@ -35,16 +35,8 @@ public class SeeTagInfo extends TagInfo {
 
   protected LinkReference linkReference() {
     if (mLink == null) {
-      // If this is a @see reference in frameworks/base, suppress errors about broken references.
-      // Outside of frameworks/base, and the generated android/R file, all such
-      // errors have been fixed, see b/80570421.
-      boolean suppressableSeeReference =
-          "@see".equals(name()) &&
-              (position().file.contains("frameworks/base/")
-                  || position().file.endsWith("android/R.java"));
-      mLink =
-          LinkReference.parse(text(), mBase, position(), !suppressableSeeReference
-              && (mBase != null ? mBase.checkLevel() : true));
+      mLink =  LinkReference.parse(text(), mBase, position(),
+          mBase != null ? mBase.checkLevel() : true);
     }
     return mLink;
   }