Merge pull request square#121 from square/py/report_excluded

Add excluded refs to leak info
Yky · May 18, 2015 · 4559d51 · 4559d51
2 parents 555c442 + fbdc604
commit 4559d51
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/leakcanary-android/src/main/java/com/squareup/leakcanary/LeakCanary.java b/leakcanary-android/src/main/java/com/squareup/leakcanary/LeakCanary.java
@@ -104,6 +104,10 @@ public static String leakInfo(Context context, HeapDump heapDump, AnalysisResult
     } else {
       info += "* NO LEAK FOUND.\n\n";
     }
+    if (detailed) {
+      detailedString += "* Excluded Refs:\n" + heapDump.excludedRefs;
+    }
+
     info += "* Reference Key: "
         + heapDump.referenceKey
         + "\n"

diff --git a/leakcanary-watcher/src/main/java/com/squareup/leakcanary/ExcludedRefs.java b/leakcanary-watcher/src/main/java/com/squareup/leakcanary/ExcludedRefs.java
@@ -47,6 +47,26 @@ private ExcludedRefs(Map<String, Set<String>> excludeFieldMap,
     this.excludedThreads = unmodifiableSet(new LinkedHashSet<>(excludedThreads));
   }
 
+  @Override public String toString() {
+    String string = "";
+    for (Map.Entry<String, Set<String>> classes : excludeFieldMap.entrySet()) {
+      String clazz = classes.getKey();
+      for (String field : classes.getValue()) {
+        string += "| Field: " + clazz + "." + field + "\n";
+      }
+    }
+    for (Map.Entry<String, Set<String>> classes : excludeStaticFieldMap.entrySet()) {
+      String clazz = classes.getKey();
+      for (String field : classes.getValue()) {
+        string += "| Static field: " + clazz + "." + field + "\n";
+      }
+    }
+    for (String thread : excludedThreads) {
+      string += "| Thread:" + thread;
+    }
+    return string;
+  }
+
   public static final class Builder {
     private final Map<String, Set<String>> excludeFieldMap = new LinkedHashMap<>();
     private final Map<String, Set<String>> excludeStaticFieldMap = new LinkedHashMap<>();