Fix ANR: Prevent synchronous network fetch on Litho layout threads

Reviewed By: defHLT

Differential Revision: D91274295

fbshipit-source-id: e52163d4ba267f27c390d6fe935afc17498d759f

Author: Andrew Cox

imagepipeline/src/main/java/com/facebook/imagepipeline/core/ImagePipelineExperiments.kt

@@ -9,6 +9,7 @@ package com.facebook.imagepipeline.core
 
 import android.content.Context
 import android.graphics.Bitmap
+import android.os.Looper
 import com.facebook.cache.common.CacheKey
 import com.facebook.common.internal.Supplier
 import com.facebook.common.internal.Suppliers
@@ -65,6 +66,7 @@ class ImagePipelineExperiments private constructor(builder: Builder) {
   val trackedKeysSize: Int
   val allowDelay: Boolean
   val handOffOnUiThreadOnly: Boolean
+  val isCriticalThread: () -> Boolean
   val shouldStoreCacheEntrySize: Boolean
   val shouldIgnoreCacheSizeMismatch: Boolean
   val shouldUseDecodingBufferHelper: Boolean
@@ -125,6 +127,7 @@ class ImagePipelineExperiments private constructor(builder: Builder) {
     @JvmField var trackedKeysSize = 20
     @JvmField var allowDelay = false
     @JvmField var handOffOnUiThreadOnly = false
+    @JvmField var isCriticalThread: (() -> Boolean)? = null
     @JvmField var shouldStoreCacheEntrySize = false
 
     @JvmField var shouldIgnoreCacheSizeMismatch = false
@@ -161,6 +164,10 @@ class ImagePipelineExperiments private constructor(builder: Builder) {
       this.handOffOnUiThreadOnly = handOffOnUiThreadOnly
     }
 
+    fun setIsCriticalThread(isCriticalThread: () -> Boolean) = asBuilder {
+      this.isCriticalThread = isCriticalThread
+    }
+
     fun setStoreCacheEntrySize(shouldStoreCacheEntrySize: Boolean) = asBuilder {
       this.shouldStoreCacheEntrySize = shouldStoreCacheEntrySize
     }
@@ -507,6 +514,18 @@ class ImagePipelineExperiments private constructor(builder: Builder) {
     animationRenderFpsLimit = builder.animationRenderFpsLimit
     allowDelay = builder.allowDelay
     handOffOnUiThreadOnly = builder.handOffOnUiThreadOnly
+    isCriticalThread =
+        builder.isCriticalThread
+            ?: {
+              // If handOffOnUiThreadOnly is false, treat every thread as critical so handoff always
+              // happens
+              if (!handOffOnUiThreadOnly) {
+                true
+              } else {
+                // Otherwise, only the main thread is critical
+                Looper.getMainLooper().thread === Thread.currentThread()
+              }
+            }
     shouldStoreCacheEntrySize = builder.shouldStoreCacheEntrySize
     shouldIgnoreCacheSizeMismatch = builder.shouldIgnoreCacheSizeMismatch
     shouldUseDecodingBufferHelper = builder.shouldUseDecodingBufferHelper

imagepipeline/src/main/java/com/facebook/imagepipeline/producers/ThreadHandoffProducer.kt

@@ -7,7 +7,6 @@
 
 package com.facebook.imagepipeline.producers
 
-import android.os.Looper
 import com.facebook.imagepipeline.instrumentation.FrescoInstrumenter
 import com.facebook.imagepipeline.systrace.FrescoSystrace.traceSection
 import java.lang.Exception
@@ -27,6 +26,7 @@ class ThreadHandoffProducer<T>(
         inputProducer.produceResults(consumer, context)
         return
       }
+
       val statefulRunnable: StatefulProducerRunnable<T> =
           object : StatefulProducerRunnable<T>(consumer, producerListener, context, PRODUCER_NAME) {
             override fun onSuccess(ignored: T?) {
@@ -64,10 +64,7 @@ class ThreadHandoffProducer<T>(
     }
 
     private fun shouldRunImmediately(context: ProducerContext): Boolean {
-      if (!context.imagePipelineConfig.experiments.handOffOnUiThreadOnly) {
-        return false
-      }
-      return Looper.getMainLooper().thread !== Thread.currentThread()
+      return !context.imagePipelineConfig.experiments.isCriticalThread()
     }
   }
 }

imagepipeline/src/test/java/com/facebook/imagepipeline/producers/ThreadHandoffProducerTest.kt

@@ -64,6 +64,7 @@ class ThreadHandoffProducerTest {
 
     Mockito.doReturn(imagePipelineExperiments).`when`(config).experiments
     Mockito.doReturn(false).`when`(imagePipelineExperiments).handOffOnUiThreadOnly
+    Mockito.doReturn({ true }).`when`(imagePipelineExperiments).isCriticalThread
   }
 
   @Test