DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Change-Id: I886448a3126b81c19342d920669e050eb5ef20eb
diff --git a/tools/droiddoc/src/Comment.java b/tools/droiddoc/src/Comment.java
index 553cdf2..f49be8f 100644
--- a/tools/droiddoc/src/Comment.java
+++ b/tools/droiddoc/src/Comment.java
@@ -334,8 +334,17 @@
{
isHidden();
isDocOnly();
- parseRegex(mText);
- parseBriefTags();
+
+ // Don't bother parsing text if we aren't generating documentation.
+ if (DroidDoc.parseComments()) {
+ parseRegex(mText);
+ parseBriefTags();
+ } else {
+ // Forces methods to be recognized by findOverriddenMethods in MethodInfo.
+ mInlineTagsList.add(new TextTagInfo("Text", "Text", mText,
+ SourcePositionInfo.add(mPosition, mText, 0)));
+ }
+
mText = null;
mInitialized = true;