diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-02 02:04:51 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-02 02:04:51 +0000 |
commit | 229a069e4b081b89420cae669e2e5bc90958387f (patch) | |
tree | e4e9c3b6a0a73f1c997bbdf39477389ad0ae4aff | |
parent | f72eda66b41f38b2c1849cb00130176ccb0a7d52 (diff) | |
parent | 3c9e3cfea2bedccff0a2ef7608d195dea917ee10 (diff) | |
download | doclava-android11-d1-s7-release.tar.gz |
Snap for 6454413 from 3c9e3cfea2bedccff0a2ef7608d195dea917ee10 to rvc-d1-releaseandroid-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-release
Change-Id: I61c8826d709554a7b608f00e512a540b055a313c
-rw-r--r-- | src/com/google/doclava/Converter.java | 16 | ||||
-rw-r--r-- | src/com/google/doclava/SeeTagInfo.java | 12 |
2 files changed, 3 insertions, 25 deletions
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; } |