react-native-tvos 0.85.3-0 → 0.86.0-0

package/ReactAndroid/api/ReactAndroid.api

@@ -943,6 +943,7 @@ public abstract class com/facebook/react/bridge/ReactContext : android/content/C
 	protected field mInteropModuleRegistry Lcom/facebook/react/bridge/interop/InteropModuleRegistry;
 	public fun <init> (Landroid/content/Context;)V
 	public fun addActivityEventListener (Lcom/facebook/react/bridge/ActivityEventListener;)V
+	public fun addExtraWindowEventListener (Lcom/facebook/react/interfaces/ExtraWindowEventListener;)V
 	public fun addLifecycleEventListener (Lcom/facebook/react/bridge/LifecycleEventListener;)V
 	public fun addWindowFocusChangeListener (Lcom/facebook/react/bridge/WindowFocusChangeListener;)V
 	public fun assertOnJSQueueThread ()V
@@ -986,6 +987,8 @@ public abstract class com/facebook/react/bridge/ReactContext : android/content/C
 	public fun isOnNativeModulesQueueThread ()Z
 	public fun isOnUiQueueThread ()Z
 	public fun onActivityResult (Landroid/app/Activity;IILandroid/content/Intent;)V
+	public fun onExtraWindowCreate (Landroid/view/Window;)V
+	public fun onExtraWindowDestroy (Landroid/view/Window;)V
 	public fun onHostDestroy ()V
 	public fun onHostDestroy (Z)V
 	public fun onHostPause ()V
@@ -995,6 +998,7 @@ public abstract class com/facebook/react/bridge/ReactContext : android/content/C
 	public fun onWindowFocusChange (Z)V
 	public abstract fun registerSegment (ILjava/lang/String;Lcom/facebook/react/bridge/Callback;)V
 	public fun removeActivityEventListener (Lcom/facebook/react/bridge/ActivityEventListener;)V
+	public fun removeExtraWindowEventListener (Lcom/facebook/react/interfaces/ExtraWindowEventListener;)V
 	public fun removeLifecycleEventListener (Lcom/facebook/react/bridge/LifecycleEventListener;)V
 	public fun removeWindowFocusChangeListener (Lcom/facebook/react/bridge/WindowFocusChangeListener;)V
 	public fun resetPerfStats ()V
@@ -2049,16 +2053,6 @@ public final class com/facebook/react/devsupport/StackTraceHelper$StackFrameImpl
 	public fun toJSON ()Lorg/json/JSONObject;
 }
 
-public final class com/facebook/react/devsupport/inspector/DevSupportHttpClient {
-	public static final field INSTANCE Lcom/facebook/react/devsupport/inspector/DevSupportHttpClient;
-	public static final fun addRequestHeader (Ljava/lang/String;Ljava/lang/String;)V
-	public final fun getHttpClient ()Lokhttp3/OkHttpClient;
-	public final fun getWebsocketClient ()Lokhttp3/OkHttpClient;
-	public static final fun httpScheme (Ljava/lang/String;)Ljava/lang/String;
-	public static final fun removeRequestHeader (Ljava/lang/String;)V
-	public static final fun wsScheme (Ljava/lang/String;)Ljava/lang/String;
-}
-
 public abstract interface class com/facebook/react/devsupport/interfaces/BundleLoadCallback {
 	public fun onError (Ljava/lang/Exception;)V
 	public abstract fun onSuccess ()V
@@ -2261,6 +2255,7 @@ public class com/facebook/react/fabric/FabricUIManager : com/facebook/react/brid
 	public fun receiveEvent (IILjava/lang/String;Lcom/facebook/react/bridge/WritableMap;)V
 	public fun receiveEvent (IILjava/lang/String;ZLcom/facebook/react/bridge/WritableMap;I)V
 	public fun receiveEvent (IILjava/lang/String;ZLcom/facebook/react/bridge/WritableMap;IZ)V
+	public fun receiveEvent (IILjava/lang/String;ZLcom/facebook/react/bridge/WritableMap;IZJ)V
 	public fun receiveEvent (ILjava/lang/String;Lcom/facebook/react/bridge/WritableMap;)V
 	public fun removeUIManagerEventListener (Lcom/facebook/react/bridge/UIManagerListener;)V
 	public fun resolveCustomDirectEventName (Ljava/lang/String;)Ljava/lang/String;
@@ -2284,9 +2279,11 @@ public final class com/facebook/react/fabric/FabricUIManagerProviderImpl : com/f
 
 public final class com/facebook/react/fabric/mounting/SurfaceMountingManager {
 	public final fun addViewAt (III)V
+	public final fun applyViewSnapshot (ILandroid/graphics/Bitmap;)V
 	public final fun attachRootView (Landroid/view/View;Lcom/facebook/react/uimanager/ThemedReactContext;)V
 	public final fun deleteView (I)V
 	public final fun enqueuePendingEvent (ILjava/lang/String;ZLcom/facebook/react/bridge/WritableMap;I)V
+	public final fun enqueuePendingEvent (ILjava/lang/String;ZLcom/facebook/react/bridge/WritableMap;IJ)V
 	public final fun getContext ()Lcom/facebook/react/uimanager/ThemedReactContext;
 	public final fun getSurfaceId ()I
 	public final fun getView (I)Landroid/view/View;
@@ -2312,6 +2309,11 @@ public final class com/facebook/react/fabric/mounting/SurfaceMountingManager {
 	public final fun updateState (ILcom/facebook/react/uimanager/StateWrapper;)V
 }
 
+public abstract interface class com/facebook/react/interfaces/ExtraWindowEventListener {
+	public abstract fun onExtraWindowCreate (Landroid/view/Window;)V
+	public abstract fun onExtraWindowDestroy (Landroid/view/Window;)V
+}
+
 public abstract interface class com/facebook/react/interfaces/TaskInterface {
 	public abstract fun getError ()Ljava/lang/Exception;
 	public abstract fun getResult ()Ljava/lang/Object;
@@ -2455,16 +2457,16 @@ public abstract interface class com/facebook/react/modules/appregistry/AppRegist
 	public abstract fun unmountApplicationComponentAtRootTag (I)V
 }
 
-public final class com/facebook/react/modules/blob/BlobModule : com/facebook/fbreact/specs/NativeBlobModuleSpec {
+public final class com/facebook/react/modules/blob/BlobModule : com/facebook/fbreact/specs/NativeBlobModuleSpec, com/facebook/react/turbomodule/core/interfaces/TurboModuleWithJSIBindings {
 	public static final field Companion Lcom/facebook/react/modules/blob/BlobModule$Companion;
 	public static final field NAME Ljava/lang/String;
 	public fun <init> (Lcom/facebook/react/bridge/ReactApplicationContext;)V
 	public fun addNetworkingHandler ()V
 	public fun addWebSocketHandler (D)V
 	public fun createFromParts (Lcom/facebook/react/bridge/ReadableArray;Ljava/lang/String;)V
+	public fun getBindingsInstaller ()Lcom/facebook/react/turbomodule/core/interfaces/BindingsInstallerHolder;
 	public final fun getLengthOfBlob (Ljava/lang/String;)J
 	public fun getTypedExportedConstants ()Ljava/util/Map;
-	public fun initialize ()V
 	public fun release (Ljava/lang/String;)V
 	public final fun remove (Ljava/lang/String;)V
 	public fun removeWebSocketHandler (D)V
@@ -3060,7 +3062,6 @@ public final class com/facebook/react/runtime/ReactSurfaceView : com/facebook/re
 	public fun <init> (Landroid/content/Context;Lcom/facebook/react/runtime/ReactSurfaceImpl;)V
 	public fun getCurrentReactContext ()Lcom/facebook/react/bridge/ReactContext;
 	public fun getJSModuleName ()Ljava/lang/String;
-	public fun getUIManagerType ()I
 	public fun handleException (Ljava/lang/Throwable;)V
 	public fun hasActiveReactContext ()Z
 	public fun hasActiveReactInstance ()Z
@@ -3069,7 +3070,6 @@ public final class com/facebook/react/runtime/ReactSurfaceView : com/facebook/re
 	public fun onChildStartedNativeGesture (Landroid/view/View;Landroid/view/MotionEvent;)V
 	public fun requestChildFocus (Landroid/view/View;Landroid/view/View;)V
 	public fun requestDisallowInterceptTouchEvent (Z)V
-	public fun setIsFabric (Z)V
 }
 
 public abstract class com/facebook/react/runtime/cxxreactpackage/CxxReactPackage {
@@ -3122,6 +3122,7 @@ public final class com/facebook/react/soloader/OpenSourceMergedSoMapping : com/f
 	public final fun libreact_devsupportjni_so ()I
 	public final fun libreact_featureflagsjni_so ()I
 	public final fun libreact_newarchdefaults_so ()I
+	public final fun libreact_tracingjni_so ()I
 	public final fun libreactnative_so ()I
 	public final fun libreactnativeblob_so ()I
 	public final fun libreactnativejni_common_so ()I
@@ -4155,6 +4156,7 @@ public final class com/facebook/react/uimanager/ThemedReactContext : com/faceboo
 	public fun <init> (Lcom/facebook/react/bridge/ReactApplicationContext;Landroid/content/Context;Ljava/lang/String;)V
 	public fun <init> (Lcom/facebook/react/bridge/ReactApplicationContext;Landroid/content/Context;Ljava/lang/String;I)V
 	public synthetic fun <init> (Lcom/facebook/react/bridge/ReactApplicationContext;Landroid/content/Context;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun addExtraWindowEventListener (Lcom/facebook/react/interfaces/ExtraWindowEventListener;)V
 	public fun addLifecycleEventListener (Lcom/facebook/react/bridge/LifecycleEventListener;)V
 	public fun destroy ()V
 	public fun getCatalystInstance ()Lcom/facebook/react/bridge/CatalystInstance;
@@ -4180,7 +4182,10 @@ public final class com/facebook/react/uimanager/ThemedReactContext : com/faceboo
 	public fun hasNativeModule (Ljava/lang/Class;)Z
 	public fun hasReactInstance ()Z
 	public fun isBridgeless ()Z
+	public fun onExtraWindowCreate (Landroid/view/Window;)V
+	public fun onExtraWindowDestroy (Landroid/view/Window;)V
 	public fun registerSegment (ILjava/lang/String;Lcom/facebook/react/bridge/Callback;)V
+	public fun removeExtraWindowEventListener (Lcom/facebook/react/interfaces/ExtraWindowEventListener;)V
 	public fun removeLifecycleEventListener (Lcom/facebook/react/bridge/LifecycleEventListener;)V
 }
 
@@ -4804,11 +4809,13 @@ public final class com/facebook/react/uimanager/events/RCTEventEmitter$DefaultIm
 public abstract interface class com/facebook/react/uimanager/events/RCTModernEventEmitter : com/facebook/react/uimanager/events/RCTEventEmitter {
 	public abstract fun receiveEvent (IILjava/lang/String;Lcom/facebook/react/bridge/WritableMap;)V
 	public abstract fun receiveEvent (IILjava/lang/String;ZILcom/facebook/react/bridge/WritableMap;I)V
+	public abstract fun receiveEvent (IILjava/lang/String;ZILcom/facebook/react/bridge/WritableMap;IJ)V
 	public abstract fun receiveEvent (ILjava/lang/String;Lcom/facebook/react/bridge/WritableMap;)V
 }
 
 public final class com/facebook/react/uimanager/events/RCTModernEventEmitter$DefaultImpls {
 	public static fun receiveEvent (Lcom/facebook/react/uimanager/events/RCTModernEventEmitter;IILjava/lang/String;Lcom/facebook/react/bridge/WritableMap;)V
+	public static fun receiveEvent (Lcom/facebook/react/uimanager/events/RCTModernEventEmitter;IILjava/lang/String;ZILcom/facebook/react/bridge/WritableMap;IJ)V
 	public static fun receiveEvent (Lcom/facebook/react/uimanager/events/RCTModernEventEmitter;ILjava/lang/String;Lcom/facebook/react/bridge/WritableMap;)V
 	public static fun receiveTouches (Lcom/facebook/react/uimanager/events/RCTModernEventEmitter;Ljava/lang/String;Lcom/facebook/react/bridge/WritableArray;Lcom/facebook/react/bridge/WritableArray;)V
 }
@@ -5511,7 +5518,6 @@ public final class com/facebook/react/views/scroll/ReactHorizontalScrollContaine
 	public static final field Companion Lcom/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager$Companion;
 	public static final field REACT_CLASS Ljava/lang/String;
 	public fun <init> ()V
-	public synthetic fun createViewInstance (ILcom/facebook/react/uimanager/ThemedReactContext;Lcom/facebook/react/uimanager/ReactStylesDiffMap;Lcom/facebook/react/uimanager/StateWrapper;)Landroid/view/View;
 	public synthetic fun createViewInstance (Lcom/facebook/react/uimanager/ThemedReactContext;)Landroid/view/View;
 	public fun createViewInstance (Lcom/facebook/react/uimanager/ThemedReactContext;)Lcom/facebook/react/views/view/ReactViewGroup;
 	public fun getName ()Ljava/lang/String;
@@ -5534,7 +5540,6 @@ public class com/facebook/react/views/scroll/ReactHorizontalScrollView : android
 	public fun fling (I)V
 	public fun focusSearch (Landroid/view/View;I)Landroid/view/View;
 	public fun getChildVisibleRect (Landroid/view/View;Landroid/graphics/Rect;Landroid/graphics/Point;)Z
-	public fun getClipToPadding ()Z
 	public fun getClippingRect (Landroid/graphics/Rect;)V
 	public fun getFadingEdgeLengthEnd ()I
 	public fun getFadingEdgeLengthStart ()I
@@ -5680,7 +5685,6 @@ public class com/facebook/react/views/scroll/ReactScrollView : android/widget/Sc
 	public fun focusSearch (Landroid/view/View;I)Landroid/view/View;
 	protected fun getBottomFadingEdgeStrength ()F
 	public fun getChildVisibleRect (Landroid/view/View;Landroid/graphics/Rect;Landroid/graphics/Point;)Z
-	public fun getClipToPadding ()Z
 	public fun getClippingRect (Landroid/graphics/Rect;)V
 	public fun getFadingEdgeLengthEnd ()I
 	public fun getFadingEdgeLengthStart ()I
@@ -5740,8 +5744,8 @@ public class com/facebook/react/views/scroll/ReactScrollView : android/widget/Sc
 	public fun setPointerEvents (Lcom/facebook/react/uimanager/PointerEvents;)V
 	public fun setReactScrollViewScrollState (Lcom/facebook/react/views/scroll/ReactScrollViewHelper$ReactScrollViewScrollState;)V
 	public fun setRemoveClippedSubviews (Z)V
-	public fun setScrollAwayTopPaddingEnabledUnstable (I)V
-	public fun setScrollAwayTopPaddingEnabledUnstable (IZ)V
+	public fun setScrollAwayPaddingEnabledUnstable (II)V
+	public fun setScrollAwayPaddingEnabledUnstable (IIZ)V
 	public fun setScrollEnabled (Z)V
 	public fun setScrollEventThrottle (I)V
 	public fun setScrollPerfTag (Ljava/lang/String;)V
@@ -5863,21 +5867,23 @@ public abstract interface class com/facebook/react/views/scroll/ReactScrollViewH
 
 public final class com/facebook/react/views/scroll/ReactScrollViewHelper$ReactScrollViewScrollState {
 	public fun <init> ()V
-	public fun <init> (Landroid/graphics/Point;ILandroid/graphics/Point;ZZFZ)V
-	public synthetic fun <init> (Landroid/graphics/Point;ILandroid/graphics/Point;ZZFZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Landroid/graphics/Point;IILandroid/graphics/Point;ZZFZ)V
+	public synthetic fun <init> (Landroid/graphics/Point;IILandroid/graphics/Point;ZZFZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Landroid/graphics/Point;
 	public final fun component2 ()I
-	public final fun component3 ()Landroid/graphics/Point;
-	public final fun component4 ()Z
+	public final fun component3 ()I
+	public final fun component4 ()Landroid/graphics/Point;
 	public final fun component5 ()Z
-	public final fun component6 ()F
-	public final fun component7 ()Z
-	public final fun copy (Landroid/graphics/Point;ILandroid/graphics/Point;ZZFZ)Lcom/facebook/react/views/scroll/ReactScrollViewHelper$ReactScrollViewScrollState;
-	public static synthetic fun copy$default (Lcom/facebook/react/views/scroll/ReactScrollViewHelper$ReactScrollViewScrollState;Landroid/graphics/Point;ILandroid/graphics/Point;ZZFZILjava/lang/Object;)Lcom/facebook/react/views/scroll/ReactScrollViewHelper$ReactScrollViewScrollState;
+	public final fun component6 ()Z
+	public final fun component7 ()F
+	public final fun component8 ()Z
+	public final fun copy (Landroid/graphics/Point;IILandroid/graphics/Point;ZZFZ)Lcom/facebook/react/views/scroll/ReactScrollViewHelper$ReactScrollViewScrollState;
+	public static synthetic fun copy$default (Lcom/facebook/react/views/scroll/ReactScrollViewHelper$ReactScrollViewScrollState;Landroid/graphics/Point;IILandroid/graphics/Point;ZZFZILjava/lang/Object;)Lcom/facebook/react/views/scroll/ReactScrollViewHelper$ReactScrollViewScrollState;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getDecelerationRate ()F
 	public final fun getFinalAnimatedPositionScroll ()Landroid/graphics/Point;
 	public final fun getLastStateUpdateScroll ()Landroid/graphics/Point;
+	public final fun getScrollAwayPaddingBottom ()I
 	public final fun getScrollAwayPaddingTop ()I
 	public fun hashCode ()I
 	public final fun isCanceled ()Z
@@ -5888,6 +5894,7 @@ public final class com/facebook/react/views/scroll/ReactScrollViewHelper$ReactSc
 	public final fun setFinalAnimatedPositionScroll (II)Lcom/facebook/react/views/scroll/ReactScrollViewHelper$ReactScrollViewScrollState;
 	public final fun setFinished (Z)V
 	public final fun setLastStateUpdateScroll (II)Lcom/facebook/react/views/scroll/ReactScrollViewHelper$ReactScrollViewScrollState;
+	public final fun setScrollAwayPaddingBottom (I)V
 	public final fun setScrollAwayPaddingTop (I)V
 	public final fun setUpdatedByScroll (Z)V
 	public fun toString ()Ljava/lang/String;
@@ -6450,6 +6457,8 @@ public class com/facebook/react/views/view/ReactViewGroup : android/view/ViewGro
 	protected fun drawChild (Landroid/graphics/Canvas;Landroid/view/View;J)Z
 	public fun endViewTransition (Landroid/view/View;)V
 	public final fun getAxOrderList ()Ljava/util/List;
+	public fun getClipBounds ()Landroid/graphics/Rect;
+	public fun getClipBounds (Landroid/graphics/Rect;)Z
 	public fun getClippingRect (Landroid/graphics/Rect;)V
 	public fun getHitSlopRect ()Landroid/graphics/Rect;
 	public fun getOverflow ()Ljava/lang/String;
@@ -6459,6 +6468,7 @@ public class com/facebook/react/views/view/ReactViewGroup : android/view/ViewGro
 	public fun getZIndexMappedChildIndex (I)I
 	public fun hasOverlappingRendering ()Z
 	protected fun onAttachedToWindow ()V
+	protected fun onConfigurationChanged (Landroid/content/res/Configuration;)V
 	public fun onHoverEvent (Landroid/view/MotionEvent;)Z
 	public fun onInterceptTouchEvent (Landroid/view/MotionEvent;)Z
 	protected fun onLayout (ZIIII)V

package/ReactAndroid/build.gradle.kts

@@ -279,6 +279,11 @@ val preparePrefab by
                           "../ReactCommon/react/renderer/animationbackend/",
                           "react/renderer/animationbackend/",
                       ),
+                      // react_renderer_viewtransition
+                      Pair(
+                          "../ReactCommon/react/renderer/viewtransition/",
+                          "react/renderer/viewtransition/",
+                      ),
                   ),
               ),
               PrefabPreprocessingEntry(
@@ -291,11 +296,10 @@ val preparePrefab by
       outputDir.set(prefabHeadersDir)
     }
 
-val createNativeDepsDirectories by
-    tasks.registering {
-      downloadsDir.mkdirs()
-      thirdPartyNdkDir.mkdirs()
-    }
+val createNativeDepsDirectories by tasks.registering {
+  downloadsDir.mkdirs()
+  thirdPartyNdkDir.mkdirs()
+}
 
 val downloadBoostDest = File(downloadsDir, "boost_${BOOST_VERSION}.tar.gz")
 val downloadBoost by
@@ -436,23 +440,21 @@ val prepareGlog by
     }
 
 // Tasks used by Fantom to download the Native 3p dependencies used.
-val prepareNative3pDependencies by
-    tasks.registering {
-      dependsOn(
-          prepareBoost,
-          prepareDoubleConversion,
-          prepareFastFloat,
-          prepareFmt,
-          prepareFolly,
-          prepareGlog,
-      )
-    }
+val prepareNative3pDependencies by tasks.registering {
+  dependsOn(
+      prepareBoost,
+      prepareDoubleConversion,
+      prepareFastFloat,
+      prepareFmt,
+      prepareFolly,
+      prepareGlog,
+  )
+}
 
-val prepareKotlinBuildScriptModel by
-    tasks.registering {
-      // This task is run when Gradle Sync is running.
-      // We create it here so we can let it depend on preBuild inside the android{}
-    }
+val prepareKotlinBuildScriptModel by tasks.registering {
+  // This task is run when Gradle Sync is running.
+  // We create it here so we can let it depend on preBuild inside the android{}
+}
 
 // As ReactAndroid builds from source, the codegen needs to be built before it can be invoked.
 // This is not the case for users of React Native, as we ship a compiled version of the codegen.
@@ -687,6 +689,10 @@ tasks.withType<KotlinCompile>().configureEach {
   exclude("com/facebook/annotationprocessors/**")
   exclude("com/facebook/react/processing/**")
   exclude("com/facebook/react/module/processing/**")
+  // These are instrumentation tests that require a device/emulator and native test
+  // libraries not available in the OSS Gradle build (Buck-only).
+  exclude("com/facebook/react/fabric/FabricMountingManagerInstrumentationTest.kt")
+  exclude("com/facebook/react/fabric/FabricMountingManagerTestHelper.kt")
 }
 
 dependencies {
@@ -695,6 +701,7 @@ dependencies {
   api(libs.androidx.autofill)
   api(libs.androidx.swiperefreshlayout)
   api(libs.androidx.tracing)
+  api(libs.androidx.window)
 
   api(libs.fbjni)
   api(libs.fresco)

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.85.3-0
+VERSION_NAME=0.86.0-0
 react.internal.publishingGroup=io.github.react-native-tvos
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

package/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/HermesSamplingProfiler.kt

@@ -8,8 +8,10 @@
 package com.facebook.hermes.instrumentation
 
 import com.facebook.soloader.SoLoader
+import com.facebook.soloader.annotation.SoLoaderLibrary
 
 /** Hermes sampling profiler static JSI API. */
+@SoLoaderLibrary("jsijniprofiler")
 public object HermesSamplingProfiler {
   init {
     SoLoader.loadLibrary("jsijniprofiler")

package/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java

@@ -138,9 +138,7 @@ public class ReactActivityDelegate {
           if (mActivity != null) {
             Window window = mActivity.getWindow();
             if (window != null) {
-              if (WindowUtilKt.isEdgeToEdgeFeatureFlagOn()) {
-                WindowUtilKt.enableEdgeToEdge(window);
-              }
+              WindowUtilKt.updateEdgeToEdgeFeatureFlag(mActivity);
               if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && isWideColorGamutEnabled()) {
                 window.setColorMode(ActivityInfo.COLOR_MODE_WIDE_COLOR_GAMUT);
               }

package/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.kt

@@ -60,6 +60,8 @@ internal class ReactAndroidHWInputDeviceHelper {
             KeyEvent.KEYCODE_DPAD_CENTER to "select",
             KeyEvent.KEYCODE_ENTER to "select",
             KeyEvent.KEYCODE_SPACE to "select",
+            KeyEvent.KEYCODE_MEDIA_PLAY to "play",
+            KeyEvent.KEYCODE_MEDIA_PAUSE to "pause",
             KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE to "playPause",
             KeyEvent.KEYCODE_MEDIA_REWIND to "rewind",
             KeyEvent.KEYCODE_MEDIA_FAST_FORWARD to "fastForward",

package/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

@@ -10,15 +10,11 @@ package com.facebook.react;
 import static com.facebook.infer.annotation.ThreadConfined.UI;
 import static com.facebook.react.bridge.ReactMarkerConstants.ATTACH_MEASURED_ROOT_VIEWS_END;
 import static com.facebook.react.bridge.ReactMarkerConstants.ATTACH_MEASURED_ROOT_VIEWS_START;
-import static com.facebook.react.bridge.ReactMarkerConstants.BUILD_NATIVE_MODULE_REGISTRY_END;
-import static com.facebook.react.bridge.ReactMarkerConstants.BUILD_NATIVE_MODULE_REGISTRY_START;
 import static com.facebook.react.bridge.ReactMarkerConstants.CHANGE_THREAD_PRIORITY;
 import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_VIEW_MANAGERS_END;
 import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_VIEW_MANAGERS_START;
 import static com.facebook.react.bridge.ReactMarkerConstants.PRE_SETUP_REACT_CONTEXT_END;
 import static com.facebook.react.bridge.ReactMarkerConstants.PRE_SETUP_REACT_CONTEXT_START;
-import static com.facebook.react.bridge.ReactMarkerConstants.PROCESS_PACKAGES_END;
-import static com.facebook.react.bridge.ReactMarkerConstants.PROCESS_PACKAGES_START;
 import static com.facebook.react.bridge.ReactMarkerConstants.REACT_CONTEXT_THREAD_END;
 import static com.facebook.react.bridge.ReactMarkerConstants.REACT_CONTEXT_THREAD_START;
 import static com.facebook.react.bridge.ReactMarkerConstants.SETUP_REACT_CONTEXT_END;
@@ -27,6 +23,7 @@ import static com.facebook.react.bridge.ReactMarkerConstants.VM_INIT;
 import static com.facebook.react.uimanager.common.UIManagerType.FABRIC;
 import static com.facebook.systrace.Systrace.TRACE_TAG_REACT;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -51,7 +48,6 @@ import com.facebook.react.bridge.JSBundleLoader;
 import com.facebook.react.bridge.JSExceptionHandler;
 import com.facebook.react.bridge.JavaScriptExecutor;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
-import com.facebook.react.bridge.NativeModuleRegistry;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactMarker;
@@ -81,7 +77,6 @@ import com.facebook.react.internal.AndroidChoreographerProvider;
 import com.facebook.react.internal.ChoreographerProvider;
 import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags;
 import com.facebook.react.modules.appearance.AppearanceModule;
-import com.facebook.react.modules.appregistry.AppRegistry;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.ReactChoreographer;
@@ -91,7 +86,6 @@ import com.facebook.react.uimanager.ReactRoot;
 import com.facebook.react.uimanager.ReactStage;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.ViewManager;
-import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper;
 import com.facebook.soloader.SoLoader;
 import com.facebook.systrace.Systrace;
@@ -593,12 +587,14 @@ public class ReactInstanceManager {
 
   /**
    * Call this from {@link Activity#onPause()}. This notifies any listening modules so they can do
-   * any necessary cleanup. The passed Activity is the current Activity being paused. This will
-   * always be the foreground activity that would be returned by {@link
-   * ReactContext#getCurrentActivity()}.
+   * any necessary cleanup. The passed Activity is the current Activity being paused. This is
+   * expected to be the foreground activity that would be returned by {@link
+   * ReactContext#getCurrentActivity()}. If the passed activity does not match the current activity,
+   * a warning will be logged instead of crashing.
    *
    * @param activity the activity being paused
    */
+  @SuppressLint("ReflectionMethodUse")
   @ThreadConfined(UI)
   public void onHostPause(@Nullable Activity activity) {
     if (mRequireActivity) {
@@ -612,15 +608,15 @@ public class ReactInstanceManager {
       }
       Assertions.assertCondition(mCurrentActivity != null);
     }
-    if (mCurrentActivity != null) {
-      Assertions.assertCondition(
-          activity == mCurrentActivity,
+    if (mCurrentActivity != null && activity != mCurrentActivity) {
+      FLog.w(
+          TAG,
           "Pausing an activity that is not the current activity, this is incorrect! "
               + "Current activity: "
               + mCurrentActivity.getClass().getSimpleName()
               + " "
               + "Paused activity: "
-              + activity.getClass().getSimpleName());
+              + (activity == null ? "null" : activity.getClass().getSimpleName()));
     }
     onHostPause();
   }
@@ -769,10 +765,7 @@ public class ReactInstanceManager {
       synchronized (mReactContextLock) {
         if (mCurrentReactContext != null) {
           for (ReactRoot reactRoot : mAttachedReactRoots) {
-            // Fabric surfaces must be cleaned up when React Native is destroyed.
-            if (reactRoot.getUIManagerType() == UIManagerType.FABRIC) {
-              detachRootViewFromInstance(reactRoot, mCurrentReactContext);
-            }
+            detachRootViewFromInstance(reactRoot, mCurrentReactContext);
           }
 
           mCurrentReactContext.destroy();
@@ -1273,9 +1266,7 @@ public class ReactInstanceManager {
 
     Systrace.beginSection(TRACE_TAG_REACT, "attachRootViewToInstance");
 
-    @Nullable
-    UIManager uiManager =
-        UIManagerHelper.getUIManager(mCurrentReactContext, reactRoot.getUIManagerType());
+    @Nullable UIManager uiManager = UIManagerHelper.getUIManager(mCurrentReactContext, FABRIC);
 
     // If we can't get a UIManager something has probably gone horribly wrong
     if (uiManager == null) {
@@ -1286,28 +1277,16 @@ public class ReactInstanceManager {
 
     @Nullable Bundle initialProperties = reactRoot.getAppProperties();
 
-    final int rootTag;
-    if (reactRoot.getUIManagerType() == FABRIC) {
-      rootTag =
-          uiManager.startSurface(
-              reactRoot.getRootViewGroup(),
-              reactRoot.getJSModuleName(),
-              initialProperties == null
-                  ? new WritableNativeMap()
-                  : Arguments.fromBundle(initialProperties),
-              reactRoot.getWidthMeasureSpec(),
-              reactRoot.getHeightMeasureSpec());
-      reactRoot.setShouldLogContentAppeared(true);
-    } else {
-      rootTag =
-          uiManager.addRootView(
-              reactRoot.getRootViewGroup(),
-              initialProperties == null
-                  ? new WritableNativeMap()
-                  : Arguments.fromBundle(initialProperties));
-      reactRoot.setRootViewTag(rootTag);
-      reactRoot.runApplication();
-    }
+    final int rootTag =
+        uiManager.startSurface(
+            reactRoot.getRootViewGroup(),
+            reactRoot.getJSModuleName(),
+            initialProperties == null
+                ? new WritableNativeMap()
+                : Arguments.fromBundle(initialProperties),
+            reactRoot.getWidthMeasureSpec(),
+            reactRoot.getHeightMeasureSpec());
+    reactRoot.setShouldLogContentAppeared(true);
 
     Systrace.beginAsyncSection(TRACE_TAG_REACT, "pre_rootView.onAttachedToReactInstance", rootTag);
     UiThreadUtil.runOnUiThread(
@@ -1328,36 +1307,28 @@ public class ReactInstanceManager {
       return;
     }
 
-    @UIManagerType int uiManagerType = reactRoot.getUIManagerType();
-    if (uiManagerType == UIManagerType.FABRIC) {
-      // Stop surface in Fabric.
-      // Calling FabricUIManager.stopSurface causes the C++ Binding.stopSurface
-      // to be called synchronously over the JNI, which causes an empty tree
-      // to be committed via the Scheduler, which will cause mounting instructions
-      // to be queued up and synchronously executed to delete and remove
-      // all the views in the hierarchy.
-      final int surfaceId = reactRoot.getRootViewTag();
-      if (surfaceId != View.NO_ID) {
-        UIManager uiManager = UIManagerHelper.getUIManager(reactContext, uiManagerType);
-        if (uiManager != null) {
-          uiManager.stopSurface(surfaceId);
-        } else {
-          FLog.w(ReactConstants.TAG, "Failed to stop surface, UIManager has already gone away");
-        }
+    // Stop surface in Fabric.
+    // Calling FabricUIManager.stopSurface causes the C++ Binding.stopSurface
+    // to be called synchronously over the JNI, which causes an empty tree
+    // to be committed via the Scheduler, which will cause mounting instructions
+    // to be queued up and synchronously executed to delete and remove
+    // all the views in the hierarchy.
+    final int surfaceId = reactRoot.getRootViewTag();
+    if (surfaceId != View.NO_ID) {
+      UIManager uiManager = UIManagerHelper.getUIManager(reactContext, FABRIC);
+      if (uiManager != null) {
+        uiManager.stopSurface(surfaceId);
       } else {
-        ReactSoftExceptionLogger.logSoftException(
-            TAG,
-            new RuntimeException(
-                "detachRootViewFromInstance called with ReactRootView with invalid id"));
+        FLog.w(ReactConstants.TAG, "Failed to stop surface, UIManager has already gone away");
       }
-
-      clearReactRoot(reactRoot);
     } else {
-      reactContext
-          .getCatalystInstance()
-          .getJSModule(AppRegistry.class)
-          .unmountApplicationComponentAtRootTag(reactRoot.getRootViewTag());
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new RuntimeException(
+              "detachRootViewFromInstance called with ReactRootView with invalid id"));
     }
+
+    clearReactRoot(reactRoot);
   }
 
   @ThreadConfined(UI)
@@ -1392,45 +1363,4 @@ public class ReactInstanceManager {
         "ReactInstanceManager.createReactContext is unsupported. CatalystInstanceImpl has been"
             + " removed.");
   }
-
-  private NativeModuleRegistry processPackages(
-      ReactApplicationContext reactContext, List<ReactPackage> packages) {
-    NativeModuleRegistryBuilder nativeModuleRegistryBuilder =
-        new NativeModuleRegistryBuilder(reactContext);
-
-    ReactMarker.logMarker(PROCESS_PACKAGES_START);
-
-    synchronized (mPackages) {
-      for (ReactPackage reactPackage : packages) {
-        Systrace.beginSection(TRACE_TAG_REACT, "createAndProcessCustomReactPackage");
-        try {
-          processPackage(reactPackage, nativeModuleRegistryBuilder);
-        } finally {
-          Systrace.endSection(TRACE_TAG_REACT);
-        }
-      }
-    }
-    ReactMarker.logMarker(PROCESS_PACKAGES_END);
-
-    ReactMarker.logMarker(BUILD_NATIVE_MODULE_REGISTRY_START);
-    Systrace.beginSection(TRACE_TAG_REACT, "buildNativeModuleRegistry");
-    NativeModuleRegistry nativeModuleRegistry;
-    try {
-      nativeModuleRegistry = nativeModuleRegistryBuilder.build();
-    } finally {
-      Systrace.endSection(TRACE_TAG_REACT);
-      ReactMarker.logMarker(BUILD_NATIVE_MODULE_REGISTRY_END);
-    }
-
-    return nativeModuleRegistry;
-  }
-
-  private void processPackage(
-      ReactPackage reactPackage, NativeModuleRegistryBuilder nativeModuleRegistryBuilder) {
-    SystraceMessage.beginSection(TRACE_TAG_REACT, "processPackage")
-        .arg("className", reactPackage.getClass().getSimpleName())
-        .flush();
-    nativeModuleRegistryBuilder.processPackage(reactPackage);
-    SystraceMessage.endSection(TRACE_TAG_REACT).flush();
-  }
 }