Include vendor info for lint checks.

This CL follows some upstream lint changes to track the
vendors for lint checks. It's now included in various
places lint checks are shown, such as the Inspections
descriptions.

Test: Existing (and the main display utility is done by
    lint and is tested in tools/base)
Bug: None
Change-Id: I510b64534064fdb0768f38f970b2b47337cb08d2

2 files changed, 26 insertions, 0 deletions

diff --git a/lint/src/com/android/tools/idea/lint/common/AndroidLintInspectionBase.java b/lint/src/com/android/tools/idea/lint/common/AndroidLintInspectionBase.java
index 13bd340c4ab..e45aa6a7746 100644
--- a/lint/src/com/android/tools/idea/lint/common/AndroidLintInspectionBase.java
+++ b/lint/src/com/android/tools/idea/lint/common/AndroidLintInspectionBase.java
@@ -24,7 +24,9 @@ import static com.intellij.xml.CommonXmlStrings.HTML_END;
 import static com.intellij.xml.CommonXmlStrings.HTML_START;
 
 import com.android.tools.lint.checks.BuiltinIssueRegistry;
+import com.android.tools.lint.client.api.IssueRegistry;
 import com.android.tools.lint.client.api.LintClient;
+import com.android.tools.lint.client.api.Vendor;
 import com.android.tools.lint.detector.api.Category;
 import com.android.tools.lint.detector.api.Implementation;
 import com.android.tools.lint.detector.api.Issue;
@@ -36,6 +38,7 @@ import com.android.tools.lint.detector.api.LintFix.ShowUrl;
 import com.android.tools.lint.detector.api.Position;
 import com.android.tools.lint.detector.api.Scope;
 import com.android.tools.lint.detector.api.Severity;
+import com.android.tools.lint.detector.api.TextFormat;
 import com.google.common.collect.Lists;
 import com.intellij.analysis.AnalysisScope;
 import com.intellij.codeHighlighting.HighlightDisplayLevel;
@@ -572,6 +575,17 @@ public abstract class AndroidLintInspectionBase extends GlobalInspectionTool {
         }
       }
     }
+
+    Vendor vendor = myIssue.getVendor();
+    IssueRegistry registry = myIssue.getRegistry();
+    if (vendor == null && registry != null) {
+      vendor = registry.getVendor();
+    }
+    if (vendor != null && vendor != IssueRegistry.Companion.getAOSP_VENDOR()) {
+      sb.append("<br/><br/>\n");
+      vendor.describeInto(sb, TextFormat.HTML, "");
+    }
+
     sb.append("</body></html>");
 
     return sb.toString();
diff --git a/lint/src/com/android/tools/idea/lint/common/LintInspectionDescriptionLinkHandler.java b/lint/src/com/android/tools/idea/lint/common/LintInspectionDescriptionLinkHandler.java
index 6f22427827a..c309b27681c 100644
--- a/lint/src/com/android/tools/idea/lint/common/LintInspectionDescriptionLinkHandler.java
+++ b/lint/src/com/android/tools/idea/lint/common/LintInspectionDescriptionLinkHandler.java
@@ -16,6 +16,8 @@
 package com.android.tools.idea.lint.common;
 
 import com.android.tools.lint.checks.BuiltinIssueRegistry;
+import com.android.tools.lint.client.api.IssueRegistry;
+import com.android.tools.lint.client.api.Vendor;
 import com.android.tools.lint.detector.api.Issue;
 import com.android.tools.lint.detector.api.TextFormat;
 import com.intellij.codeInsight.highlighting.TooltipLinkHandler;
@@ -51,6 +53,16 @@ public class LintInspectionDescriptionLinkHandler extends TooltipLinkHandler {
         }
       }
 
+      Vendor vendor = issue.getVendor();
+      IssueRegistry registry = issue.getRegistry();
+      if (vendor == null && registry != null) {
+        vendor = registry.getVendor();
+      }
+      if (vendor != null) {
+        sb.append("<br>\n");
+        vendor.describeInto(sb, TextFormat.HTML, "");
+      }
+
       return sb.toString();
     }