Merge pull request #2367 from square/py/looper_null

Handler null looper
square · Apr 20, 2022 · cacd5b3 · cacd5b3
2 parents be925ba + 207a77e
commit cacd5b3
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/plumber-android-core/src/main/java/leakcanary/AndroidLeakFixes.kt b/plumber-android-core/src/main/java/leakcanary/AndroidLeakFixes.kt
@@ -168,13 +168,17 @@ enum class AndroidLeakFixes {
                 threadId to thread
               }
             }
-          flushedThreadIds += newHandlerThreadsById.map { it.first }
           newHandlerThreadsById
-            .map { it.second }
-            .forEach { handlerThread ->
+            .forEach { (threadId, handlerThread) ->
+              val looper = handlerThread.looper
+              if (looper == null) {
+                SharkLog.d { "Handler thread found without a looper: $handlerThread" }
+                return@forEach
+              }
+              flushedThreadIds += threadId
               SharkLog.d { "Setting up flushing for $handlerThread" }
               var scheduleFlush = true
-              val flushHandler = Handler(handlerThread.looper)
+              val flushHandler = Handler(looper)
               flushHandler.onEachIdle {
                 if (handlerThread.isAlive && scheduleFlush) {
                   scheduleFlush = false