Add reason to NoAnalysis

leakcanary-android-instrumentation/api/leakcanary-android-instrumentation.api

@@ -47,6 +47,7 @@ public final class leakcanary/InstrumentationLeakDetector$Result$AnalysisPerform
 }
 
 public final class leakcanary/InstrumentationLeakDetector$Result$NoAnalysis : leakcanary/InstrumentationLeakDetector$Result {
-	public static final field INSTANCE Lleakcanary/InstrumentationLeakDetector$Result$NoAnalysis;
+	public fun <init> (Ljava/lang/String;)V
+	public final fun getReason ()Ljava/lang/String;
 }
 

leakcanary-android-instrumentation/src/androidTest/java/leakcanary/TestUtils.kt

@@ -9,7 +9,9 @@ object TestUtils {
     val leakDetector = InstrumentationLeakDetector()
 
     val heapAnalysis = when (val result = leakDetector.detectLeaks()) {
-      is NoAnalysis -> throw AssertionError("Expected analysis to be performed")
+      is NoAnalysis -> throw AssertionError(
+        "Expected analysis to be performed but skipped because ${result.reason}"
+      )
       is AnalysisPerformed -> result.heapAnalysis
     }
 

leakcanary-android-instrumentation/src/main/java/leakcanary/InstrumentationLeakDetector.kt

@@ -83,7 +83,7 @@ class InstrumentationLeakDetector {
    * The result of calling [detectLeaks], which is either [NoAnalysis] or [AnalysisPerformed].
    */
   sealed class Result {
-    object NoAnalysis : Result()
+    class NoAnalysis(val reason: String) : Result()
     class AnalysisPerformed(val heapAnalysis: HeapAnalysis) : Result()
   }
 
@@ -99,25 +99,25 @@ class InstrumentationLeakDetector {
     val refWatcher = AppWatcher.objectWatcher
 
     if (!refWatcher.hasWatchedObjects) {
-      return NoAnalysis
+      return NoAnalysis("No watched objects.")
     }
 
     instrumentation.waitForIdleSync()
     if (!refWatcher.hasWatchedObjects) {
-      return NoAnalysis
+      return NoAnalysis("No watched objects after waiting for idle sync.")
     }
 
     runGc()
     if (!refWatcher.hasWatchedObjects) {
-      return NoAnalysis
+      return NoAnalysis("No watched objects after triggering an explicit GC.")
     }
 
     // Waiting for any delayed UI post (e.g. scroll) to clear. This shouldn't be needed, but
     // Android simply has way too many delayed posts that aren't canceled when views are detached.
     SystemClock.sleep(2000)
 
     if (!refWatcher.hasWatchedObjects) {
-      return NoAnalysis
+      return NoAnalysis("No watched objects after delayed UI post is cleared.")
     }
 
     // Aaand we wait some more.
@@ -133,7 +133,7 @@ class InstrumentationLeakDetector {
     runGc()
 
     if (!refWatcher.hasRetainedObjects) {
-      return NoAnalysis
+      return NoAnalysis("No watched objects after a second explicit GC.")
     }
 
     // We're always reusing the same file since we only execute this once at a time.