react-native-tvos 0.83.1-0 → 0.84.0-0rc0

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<18744192baedc0d5fa0fc7873adf0422>>
+ * @generated SignedSource<<995c1c3035757935dc7a4c4d6778e43e>>
  */
 
 /**
@@ -29,22 +29,26 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun cxxNativeAnimatedEnabled(): Boolean
 
-  @DoNotStrip public fun cxxNativeAnimatedRemoveJsSync(): Boolean
-
   @DoNotStrip public fun disableEarlyViewCommandExecution(): Boolean
 
-  @DoNotStrip public fun disableFabricCommitInCXXAnimated(): Boolean
+  @DoNotStrip public fun disableImageViewPreallocationAndroid(): Boolean
 
   @DoNotStrip public fun disableMountItemReorderingAndroid(): Boolean
 
   @DoNotStrip public fun disableOldAndroidAttachmentMetricsWorkarounds(): Boolean
 
+  @DoNotStrip public fun disableSubviewClippingAndroid(): Boolean
+
   @DoNotStrip public fun disableTextLayoutManagerCacheAndroid(): Boolean
 
+  @DoNotStrip public fun disableViewPreallocationAndroid(): Boolean
+
   @DoNotStrip public fun enableAccessibilityOrder(): Boolean
 
   @DoNotStrip public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean
 
+  @DoNotStrip public fun enableAndroidAntialiasedBorderRadiusClipping(): Boolean
+
   @DoNotStrip public fun enableAndroidLinearText(): Boolean
 
   @DoNotStrip public fun enableAndroidTextMeasurementOptimizations(): Boolean
@@ -63,6 +67,8 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun enableEagerRootViewAttachment(): Boolean
 
+  @DoNotStrip public fun enableExclusivePropsUpdateAndroid(): Boolean
+
   @DoNotStrip public fun enableFabricLogs(): Boolean
 
   @DoNotStrip public fun enableFabricRenderer(): Boolean
@@ -75,6 +81,8 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun enableImagePrefetchingAndroid(): Boolean
 
+  @DoNotStrip public fun enableImagePrefetchingJNIBatchingAndroid(): Boolean
+
   @DoNotStrip public fun enableImagePrefetchingOnUiThreadAndroid(): Boolean
 
   @DoNotStrip public fun enableImmediateUpdateModeForContentOffsetChanges(): Boolean
@@ -103,8 +111,6 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun enablePropsUpdateReconciliationAndroid(): Boolean
 
-  @DoNotStrip public fun enableResourceTimingAPI(): Boolean
-
   @DoNotStrip public fun enableSwiftUIBasedFilters(): Boolean
 
   @DoNotStrip public fun enableViewCulling(): Boolean
@@ -119,8 +125,6 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun enableViewRecyclingForView(): Boolean
 
-  @DoNotStrip public fun enableVirtualViewClippingWithoutScrollViewClipping(): Boolean
-
   @DoNotStrip public fun enableVirtualViewContainerStateExperimental(): Boolean
 
   @DoNotStrip public fun enableVirtualViewDebugFeatures(): Boolean
@@ -133,6 +137,8 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun fixMappingOfEventPrioritiesBetweenFabricAndReact(): Boolean
 
+  @DoNotStrip public fun fixTextClippingAndroid15useBoundsForWidth(): Boolean
+
   @DoNotStrip public fun fuseboxAssertSingleHostState(): Boolean
 
   @DoNotStrip public fun fuseboxEnabledRelease(): Boolean
@@ -153,12 +159,18 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun shouldPressibilityUseW3CPointerEventsForHover(): Boolean
 
+  @DoNotStrip public fun shouldResetClickableWhenRecyclingView(): Boolean
+
+  @DoNotStrip public fun shouldResetOnClickListenerWhenRecyclingView(): Boolean
+
+  @DoNotStrip public fun shouldSetEnabledBasedOnAccessibilityState(): Boolean
+
+  @DoNotStrip public fun shouldSetIsClickableByDefault(): Boolean
+
   @DoNotStrip public fun shouldTriggerResponderTransferOnScrollAndroid(): Boolean
 
   @DoNotStrip public fun skipActivityIdentityAssertionOnHostPause(): Boolean
 
-  @DoNotStrip public fun sweepActiveTouchOnChildNativeGesturesAndroid(): Boolean
-
   @DoNotStrip public fun traceTurboModulePromiseRejectionsOnAndroid(): Boolean
 
   @DoNotStrip public fun updateRuntimeShadowNodeReferencesOnCommit(): Boolean
@@ -167,14 +179,8 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun useFabricInterop(): Boolean
 
-  @DoNotStrip public fun useNativeEqualsInNativeReadableArrayAndroid(): Boolean
-
-  @DoNotStrip public fun useNativeTransformHelperAndroid(): Boolean
-
   @DoNotStrip public fun useNativeViewConfigsInBridgelessMode(): Boolean
 
-  @DoNotStrip public fun useOptimizedEventBatchingOnAndroid(): Boolean
-
   @DoNotStrip public fun useRawPropsJsiValue(): Boolean
 
   @DoNotStrip public fun useShadowNodeStateOnClone(): Boolean

package/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleManager.kt

@@ -11,7 +11,6 @@ import androidx.annotation.GuardedBy
 import com.facebook.common.logging.FLog
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
-import com.facebook.react.bridge.CxxModuleWrapper
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.RuntimeExecutor
 import com.facebook.react.common.annotations.FrameworkAPI
@@ -53,7 +52,6 @@ public class TurboModuleManager(
   @DoNotStrip
   private val mHybridData: HybridData =
       initHybrid(
-          runtimeExecutor,
           jsCallInvokerHolder as CallInvokerHolderImpl,
           nativeMethodCallInvokerHolder as NativeMethodCallInvokerHolderImpl,
           delegate,
@@ -61,7 +59,7 @@ public class TurboModuleManager(
 
   init {
 
-    installJSIBindings(shouldEnableLegacyModuleInterop())
+    installJSIBindings(runtimeExecutor)
 
     eagerInitModuleNames = delegate?.getEagerInitModuleNames() ?: emptyList()
 
@@ -73,7 +71,7 @@ public class TurboModuleManager(
             ModuleProvider { moduleName: String -> delegate.getModule(moduleName) as NativeModule? }
 
     legacyModuleProvider =
-        if (delegate == null || !shouldEnableLegacyModuleInterop()) nullProvider
+        if (delegate == null) nullProvider
         else
             ModuleProvider { moduleName: String ->
               val nativeModule = delegate.getLegacyModule(moduleName)
@@ -94,9 +92,6 @@ public class TurboModuleManager(
   private fun isLegacyModule(moduleName: String): Boolean =
       delegate?.unstable_isLegacyModuleRegistered(moduleName) == true
 
-  private fun shouldEnableLegacyModuleInterop(): Boolean =
-      delegate?.unstable_shouldEnableLegacyModuleInterop() == true
-
   // used from TurboModuleManager.cpp
   @Suppress("unused")
   @DoNotStrip
@@ -110,39 +105,7 @@ public class TurboModuleManager(
     }
 
     val module = getModule(moduleName)
-    return if (module !is CxxModuleWrapper && module !is TurboModule) module else null
-  }
-
-  // used from TurboModuleManager.cpp
-  @Suppress("unused")
-  @DoNotStrip
-  private fun getLegacyCxxModule(moduleName: String): CxxModuleWrapper? {
-    /*
-     * This API is invoked from global.nativeModuleProxy.
-     * Only call getModule if the native module is a legacy module.
-     */
-    if (!isLegacyModule(moduleName)) {
-      return null
-    }
-
-    val module = getModule(moduleName)
-    return if (module is CxxModuleWrapper && module !is TurboModule) module else null
-  }
-
-  // used from TurboModuleManager.cpp
-  @Suppress("unused")
-  @DoNotStrip
-  private fun getTurboLegacyCxxModule(moduleName: String): CxxModuleWrapper? {
-    /*
-     * This API is invoked from global.__turboModuleProxy.
-     * Only call getModule if the native module is a turbo module.
-     */
-    if (!isTurboModule(moduleName)) {
-      return null
-    }
-
-    val module = getModule(moduleName)
-    return if (module is CxxModuleWrapper && module is TurboModule) module else null
+    return if (module !is TurboModule) module else null
   }
 
   // used from TurboModuleManager.cpp
@@ -158,7 +121,7 @@ public class TurboModuleManager(
     }
 
     val module = getModule(moduleName)
-    return if (module !is CxxModuleWrapper && module is TurboModule) module else null
+    return if (module is TurboModule) module else null
   }
 
   /**
@@ -314,13 +277,12 @@ public class TurboModuleManager(
   }
 
   private external fun initHybrid(
-      runtimeExecutor: RuntimeExecutor,
       jsCallInvokerHolder: CallInvokerHolderImpl,
       nativeMethodCallInvoker: NativeMethodCallInvokerHolderImpl,
       tmmDelegate: TurboModuleManagerDelegate?,
   ): HybridData
 
-  private external fun installJSIBindings(shouldCreateLegacyModules: Boolean)
+  private external fun installJSIBindings(runtimeExecutor: RuntimeExecutor)
 
   override fun invalidate() {
     /*

package/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleManagerDelegate.kt

@@ -48,9 +48,6 @@ public abstract class TurboModuleManagerDelegate {
 
   public open fun getEagerInitModuleNames(): List<String> = emptyList()
 
-  /** Can the TurboModule system create legacy modules? */
-  public open fun unstable_shouldEnableLegacyModuleInterop(): Boolean = false
-
   // TODO(T171231381): Consider removing this method: could we just use the static initializer
   // of derived classes instead?
   @Synchronized protected fun maybeLoadOtherSoLibraries(): Unit = Unit

package/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/AppearanceModule.kt

@@ -28,13 +28,42 @@ constructor(
 
   private var lastEmittedColorScheme: String? = null
 
+  private val schemeChangeListener: () -> Unit = {
+    val activity = reactApplicationContext.getCurrentActivity()
+    onConfigurationChanged(activity ?: reactApplicationContext)
+  }
+
+  init {
+    // Register as a listener for color scheme changes if override is provided
+    overrideColorScheme?.addSchemeChangeListener(schemeChangeListener)
+  }
+
   /** Optional override to the current color scheme */
-  public fun interface OverrideColorScheme {
+  public interface OverrideColorScheme {
     /**
      * Color scheme will use the return value instead of the current system configuration. Available
      * scheme: {light, dark}
      */
     public fun getScheme(): String
+
+    /**
+     * Register a listener to be notified when the color scheme changes. The listener will be
+     * invoked whenever the underlying theme preference changes.
+     *
+     * Default implementation does nothing. Override this method if you want to support dynamic
+     * color scheme updates.
+     */
+    public fun addSchemeChangeListener(listener: () -> Unit) {
+      // no-op
+    }
+
+    /**
+     * Unregisters a previously added color scheme change listener. Default implementation is a
+     * no-op; override to remove the listener from your source.
+     */
+    public fun removeSchemeChangeListener(listener: () -> Unit) {
+      // no-op
+    }
   }
 
   private fun colorSchemeForCurrentConfiguration(context: Context): String {
@@ -98,6 +127,12 @@ constructor(
     Companion.invalidatePlatformColorCache?.run()
   }
 
+  public override fun invalidate() {
+    overrideColorScheme?.removeSchemeChangeListener(schemeChangeListener)
+    invalidatePlatformColorCache()
+    super.invalidate()
+  }
+
   public companion object {
     public const val NAME: String = NativeAppearanceSpec.NAME
     private const val APPEARANCE_CHANGED_EVENT_NAME = "appearanceChanged"

package/ReactAndroid/src/main/java/com/facebook/react/modules/debug/FpsDebugFrameCallback.kt

@@ -26,8 +26,6 @@ internal class FpsDebugFrameCallback(private val reactContext: ReactContext) :
     Choreographer.FrameCallback {
 
   private var choreographer: Choreographer? = null
-  private val didJSUpdateUiDuringFrameDetector: DidJSUpdateUiDuringFrameDetector =
-      DidJSUpdateUiDuringFrameDetector()
   private var firstFrameTime: Long = -1
   private var lastFrameTime: Long = -1
   private var numFrameCallbacks = 0
@@ -40,11 +38,7 @@ internal class FpsDebugFrameCallback(private val reactContext: ReactContext) :
     if (firstFrameTime == -1L) {
       firstFrameTime = l
     }
-    val lastFrameStartTime = lastFrameTime
     lastFrameTime = l
-    if (didJSUpdateUiDuringFrameDetector.getDidJSHitFrameAndCleanup(lastFrameStartTime, l)) {
-      numFrameCallbacksWithBatchDispatches++
-    }
     numFrameCallbacks++
     val expectedNumFrames = expectedNumFrames
     val framesDropped = expectedNumFrames - expectedNumFramesPrev - 1
@@ -61,17 +55,9 @@ internal class FpsDebugFrameCallback(private val reactContext: ReactContext) :
     // removeBridgeIdleDebugListener for Bridgeless
     @Suppress("DEPRECATION")
     if (!ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) {
-      val uiManagerModule =
-          reactContext.getNativeModule(com.facebook.react.uimanager.UIManagerModule::class.java)
-      if (!reactContext.isBridgeless) {
-        reactContext.catalystInstance.addBridgeIdleDebugListener(didJSUpdateUiDuringFrameDetector)
-        isRunningOnFabric = false
-      } else {
-        // T172641976 Consider either implementing a mechanism similar to addBridgeIdleDebugListener
-        // for Fabric or point users to use RNDT.
-        isRunningOnFabric = true
-      }
-      uiManagerModule?.setViewHierarchyUpdateDebugListener(didJSUpdateUiDuringFrameDetector)
+      // T172641976 Consider either implementing a mechanism similar to addBridgeIdleDebugListener
+      // for Fabric or point users to use RNDT.
+      isRunningOnFabric = true
     }
     this.targetFps = targetFps
     UiThreadUtil.runOnUiThread {
@@ -82,16 +68,6 @@ internal class FpsDebugFrameCallback(private val reactContext: ReactContext) :
 
   fun stop() {
     @Suppress("DEPRECATION")
-    if (!ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) {
-      val uiManagerModule =
-          reactContext.getNativeModule(com.facebook.react.uimanager.UIManagerModule::class.java)
-      if (!reactContext.isBridgeless) {
-        reactContext.catalystInstance.removeBridgeIdleDebugListener(
-            didJSUpdateUiDuringFrameDetector
-        )
-      }
-      uiManagerModule?.setViewHierarchyUpdateDebugListener(null)
-    }
     UiThreadUtil.runOnUiThread {
       choreographer = Choreographer.getInstance()
       choreographer?.removeFrameCallback(this)

package/ReactAndroid/src/main/java/com/facebook/react/modules/devloading/DevLoadingModule.kt

@@ -30,9 +30,14 @@ internal class DevLoadingModule(reactContext: ReactApplicationContext) :
     }
   }
 
-  override fun showMessage(message: String, color: Double?, backgroundColor: Double?) {
+  override fun showMessage(
+      message: String,
+      color: Double?,
+      backgroundColor: Double?,
+      dismissButton: Boolean?,
+  ) {
     UiThreadUtil.runOnUiThread {
-      devLoadingViewManager?.showMessage(message, color, backgroundColor)
+      devLoadingViewManager?.showMessage(message, color, backgroundColor, dismissButton)
     }
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt

@@ -52,6 +52,29 @@ internal object NetworkEventUtil {
     }
   }
 
+  @Deprecated("Compatibility overload")
+  @JvmStatic
+  fun onCreateRequest(
+      devToolsRequestId: String,
+      requestUrl: String,
+      requestMethod: String,
+      requestHeaders: Map<String, String>,
+      requestBody: String,
+      encodedDataLength: Long,
+  ) {
+    if (ReactNativeFeatureFlags.enableNetworkEventReporting()) {
+      InspectorNetworkReporter.reportRequestStart(
+          devToolsRequestId,
+          requestUrl,
+          requestMethod,
+          requestHeaders,
+          requestBody,
+          encodedDataLength,
+      )
+      InspectorNetworkReporter.reportConnectionTiming(devToolsRequestId, requestHeaders)
+    }
+  }
+
   @JvmStatic
   fun onDataSend(
       reactContext: ReactApplicationContext?,

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt

@@ -13,8 +13,8 @@ public object ReactNativeVersion {
   @JvmField
   public val VERSION: Map<String, Any?> = mapOf(
     "major" to 0,
-    "minor" to 83,
-    "patch" to 1,
-    "prerelease" to "0"
+    "minor" to 84,
+    "patch" to 0,
+    "prerelease" to "0rc0"
   )
 }

package/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.kt

@@ -19,15 +19,16 @@ public open class PackagerConnectionSettings(private val appContext: Context) {
   private val preferences: SharedPreferences =
       PreferenceManager.getDefaultSharedPreferences(appContext)
   public val packageName: String = appContext.packageName
-  private val _additionalOptionsForPackager: MutableMap<String, String> = mutableMapOf()
-  private var _packagerOptionsUpdater: (Map<String, String>) -> Map<String, String> = { it }
-  private var cachedHost: String? = null
+
+  init {
+    resetDebugServerHost()
+  }
 
   public open var debugServerHost: String
     get() {
       // Check cached host first. If empty try to detect emulator type and use default
       // hostname for those
-      cachedHost?.let {
+      _cachedOrOverrideHost?.let {
         return it
       }
 
@@ -44,19 +45,19 @@ public open class PackagerConnectionSettings(private val appContext: Context) {
         )
       }
 
-      cachedHost = host
+      _cachedOrOverrideHost = host
       return host
     }
     set(host) {
       if (host.isEmpty()) {
-        cachedHost = null
+        _cachedOrOverrideHost = null
       } else {
-        cachedHost = host
+        _cachedOrOverrideHost = host
       }
     }
 
   public open fun resetDebugServerHost() {
-    cachedHost = null
+    _cachedOrOverrideHost = null
   }
 
   public fun setPackagerOptionsUpdater(queryMapper: (Map<String, String>) -> Map<String, String>) {
@@ -76,5 +77,11 @@ public open class PackagerConnectionSettings(private val appContext: Context) {
   private companion object {
     private val TAG = PackagerConnectionSettings::class.java.simpleName
     private const val PREFS_DEBUG_SERVER_HOST_KEY = "debug_http_host"
+
+    // The state for this class needs to be retained in the companion object.
+    // That's necessary in the case when there are multiple instances of PackagerConnectionSettings
+    private var _cachedOrOverrideHost: String? = null
+    private val _additionalOptionsForPackager: MutableMap<String, String> = mutableMapOf()
+    private var _packagerOptionsUpdater: (Map<String, String>) -> Map<String, String> = { it }
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt

@@ -19,7 +19,6 @@ import com.facebook.react.bridge.NativeArray
 import com.facebook.react.bridge.NativeArrayInterface
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.NativeModuleRegistry
-import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener
 import com.facebook.react.bridge.RuntimeExecutor
 import com.facebook.react.bridge.RuntimeScheduler
 import com.facebook.react.bridge.UIManager
@@ -140,14 +139,6 @@ internal class BridgelessCatalystInstance(private val reactHost: ReactHostImpl)
   override val sourceURL: String
     get() = throw UnsupportedOperationException("Unimplemented method 'getSourceURL'")
 
-  override fun addBridgeIdleDebugListener(listener: NotThreadSafeBridgeIdleDebugListener) {
-    throw UnsupportedOperationException("Unimplemented method 'addBridgeIdleDebugListener'")
-  }
-
-  override fun removeBridgeIdleDebugListener(listener: NotThreadSafeBridgeIdleDebugListener) {
-    throw UnsupportedOperationException("Unimplemented method 'removeBridgeIdleDebugListener'")
-  }
-
   override fun registerSegment(segmentId: Int, path: String) {
     throw UnsupportedOperationException("Unimplemented method 'registerSegment'")
   }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt

@@ -43,8 +43,11 @@ import com.facebook.react.devsupport.DevMenuConfiguration
 import com.facebook.react.devsupport.DevSupportManagerBase
 import com.facebook.react.devsupport.DevSupportManagerFactory
 import com.facebook.react.devsupport.InspectorFlags
+import com.facebook.react.devsupport.inspector.FrameTimingsObserver
 import com.facebook.react.devsupport.inspector.InspectorNetworkHelper
 import com.facebook.react.devsupport.inspector.InspectorNetworkRequestListener
+import com.facebook.react.devsupport.inspector.TracingState
+import com.facebook.react.devsupport.inspector.TracingStateListener
 import com.facebook.react.devsupport.interfaces.BundleLoadCallback
 import com.facebook.react.devsupport.interfaces.DevSupportManager
 import com.facebook.react.devsupport.interfaces.DevSupportManager.PausedInDebuggerOverlayCommandListener
@@ -147,6 +150,7 @@ public class ReactHostImpl(
   private val beforeDestroyListeners: MutableList<() -> Unit> = CopyOnWriteArrayList()
 
   internal var reactHostInspectorTarget: ReactHostInspectorTarget? = null
+  private var frameTimingsObserver: FrameTimingsObserver? = null
 
   @Volatile private var hostInvalidated = false
 
@@ -1262,10 +1266,6 @@ public class ReactHostImpl(
     val method = "getOrCreateReloadTask()"
     stateTracker.enterState(method)
 
-    // Log how React Native is destroyed
-    // TODO(T136397487): Remove after Venice is shipped to 100%
-    raiseSoftException(method, reason)
-
     reloadTask?.let {
       return it
     }
@@ -1417,10 +1417,6 @@ public class ReactHostImpl(
     val method = "getOrCreateDestroyTask()"
     stateTracker.enterState(method)
 
-    // Log how React Native is destroyed
-    // TODO(T136397487): Remove after Venice is shipped to 100%
-    raiseSoftException(method, reason, ex)
-
     destroyTask?.let {
       return it
     }
@@ -1442,8 +1438,7 @@ public class ReactHostImpl(
                 // If the host has been invalidated, now that the current context/instance
                 // has been unregistered, we can safely destroy the host's inspector
                 // target.
-                reactHostInspectorTarget?.close()
-                reactHostInspectorTarget = null
+                destroyReactHostInspectorTarget()
               }
 
               // Step 1: Destroy DevSupportManager
@@ -1554,13 +1549,52 @@ public class ReactHostImpl(
 
   internal fun getOrCreateReactHostInspectorTarget(): ReactHostInspectorTarget? {
     if (reactHostInspectorTarget == null && InspectorFlags.getFuseboxEnabled()) {
-      // NOTE: ReactHostInspectorTarget only retains a weak reference to `this`.
-      reactHostInspectorTarget = ReactHostInspectorTarget(this)
+      reactHostInspectorTarget = createReactHostInspectorTarget()
     }
 
     return reactHostInspectorTarget
   }
 
+  private fun createReactHostInspectorTarget(): ReactHostInspectorTarget {
+    // NOTE: ReactHostInspectorTarget only retains a weak reference to `this`.
+    val inspectorTarget = ReactHostInspectorTarget(this)
+    inspectorTarget.registerTracingStateListener(
+        TracingStateListener { state: TracingState, _screenshotsEnabled: Boolean ->
+          when (state) {
+            TracingState.ENABLED_IN_BACKGROUND_MODE,
+            TracingState.ENABLED_IN_CDP_MODE -> {
+              currentActivity?.window?.let { window ->
+                val observer =
+                    FrameTimingsObserver(
+                        window,
+                        _screenshotsEnabled,
+                        { frameTimingsSequence ->
+                          inspectorTarget.recordFrameTimings(frameTimingsSequence)
+                        },
+                    )
+                observer.start()
+                frameTimingsObserver = observer
+              }
+            }
+            TracingState.DISABLED -> {
+              frameTimingsObserver?.stop()
+              frameTimingsObserver = null
+            }
+          }
+        }
+    )
+
+    return inspectorTarget
+  }
+
+  private fun destroyReactHostInspectorTarget() {
+    frameTimingsObserver?.stop()
+    frameTimingsObserver = null
+
+    reactHostInspectorTarget?.close()
+    reactHostInspectorTarget = null
+  }
+
   @ThreadConfined(ThreadConfined.UI)
   internal fun unregisterInstanceFromInspector(reactInstance: ReactInstance?) {
     if (reactInstance != null) {

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImplDevHelper.kt

@@ -16,8 +16,8 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.common.annotations.FrameworkAPI
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.devsupport.ReactInstanceDevHelper
-import com.facebook.react.devsupport.interfaces.TracingState
-import com.facebook.react.devsupport.interfaces.TracingStateProvider
+import com.facebook.react.devsupport.inspector.TracingState
+import com.facebook.react.devsupport.inspector.TracingStateProvider
 import com.facebook.react.devsupport.perfmonitor.PerfMonitorDevHelper
 import com.facebook.react.devsupport.perfmonitor.PerfMonitorInspectorTarget
 import com.facebook.react.interfaces.TaskInterface
@@ -81,6 +81,6 @@ internal class ReactHostImplDevHelper(private val delegate: ReactHostImpl) :
       delegate.loadBundle(bundleLoader)
 
   override fun getTracingState(): TracingState {
-    return delegate.reactHostInspectorTarget?.getTracingState() ?: TracingState.ENABLEDINCDPMODE
+    return delegate.reactHostInspectorTarget?.getTracingState() ?: TracingState.ENABLED_IN_CDP_MODE
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt

@@ -12,7 +12,9 @@ import com.facebook.proguard.annotations.DoNotStripAny
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.common.annotations.FrameworkAPI
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
-import com.facebook.react.devsupport.interfaces.TracingState
+import com.facebook.react.devsupport.inspector.FrameTimingSequence
+import com.facebook.react.devsupport.inspector.TracingState
+import com.facebook.react.devsupport.inspector.TracingStateListener
 import com.facebook.react.devsupport.perfmonitor.PerfMonitorInspectorTarget
 import com.facebook.react.devsupport.perfmonitor.PerfMonitorUpdateListener
 import com.facebook.soloader.SoLoader
@@ -41,37 +43,29 @@ internal class ReactHostInspectorTarget(reactHostImpl: ReactHostImpl) :
 
   external fun stopAndDiscardBackgroundTrace()
 
-  external fun tracingStateAsInt(): Int
+  external override fun getTracingState(): TracingState
 
-  override fun getTracingState(): TracingState {
-    return TracingState.entries[tracingStateAsInt()]
-  }
+  external fun registerTracingStateListener(listener: TracingStateListener): Long
+
+  external fun unregisterTracingStateListener(subscriptionId: Long)
+
+  external fun recordFrameTimings(frameTimingSequence: FrameTimingSequence)
 
   override fun addPerfMonitorListener(listener: PerfMonitorUpdateListener) {
     perfMonitorListeners.add(listener)
+    registerTracingStateListener { state, _ -> listener.onRecordingStateChanged(state) }
   }
 
   override fun pauseAndAnalyzeBackgroundTrace(): Boolean {
-    val emitted = stopAndMaybeEmitBackgroundTrace()
-    perfMonitorListeners.forEach { listener ->
-      listener.onRecordingStateChanged(TracingState.DISABLED)
-    }
-
-    return emitted
+    return stopAndMaybeEmitBackgroundTrace()
   }
 
   override fun resumeBackgroundTrace() {
     startBackgroundTrace()
-    perfMonitorListeners.forEach { listener ->
-      listener.onRecordingStateChanged(TracingState.ENABLEDINBACKGROUNDMODE)
-    }
   }
 
   override fun stopBackgroundTrace() {
     stopAndDiscardBackgroundTrace()
-    perfMonitorListeners.forEach { listener ->
-      listener.onRecordingStateChanged(TracingState.DISABLED)
-    }
   }
 
   fun handleNativePerfIssueAdded(