diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/interop/InteropModuleRegistry.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/interop/InteropModuleRegistry.kt index 6dfe871c06a..8a64325d498 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/interop/InteropModuleRegistry.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/interop/InteropModuleRegistry.kt @@ -10,7 +10,6 @@ package com.facebook.react.bridge.interop import com.facebook.react.bridge.JavaScriptModule import com.facebook.react.common.annotations.internal.InteropLegacyArchitecture import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger -import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags.enableFabricRenderer import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags.useFabricInterop /** @@ -44,8 +43,7 @@ internal class InteropModuleRegistry { } } - private fun checkReactFeatureFlagsConditions(): Boolean = - enableFabricRenderer() && useFabricInterop() + private fun checkReactFeatureFlagsConditions(): Boolean = useFabricInterop() private companion object { init { diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/interop/InteropModuleRegistryTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/interop/InteropModuleRegistryTest.kt index 222c803c96d..3ab0ce2f99b 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/interop/InteropModuleRegistryTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/interop/InteropModuleRegistryTest.kt @@ -48,7 +48,7 @@ class InteropModuleRegistryTest { @Test fun getInteropModule_withRegisteredClassAndInvalidFlags_returnsNull() { - overrideFeatureFlags(false, false) + overrideFeatureFlags(false) underTest.registerInteropModule(RCTEventEmitter::class.java, FakeRCTEventEmitter()) val interopModule = underTest.getInteropModule(RCTEventEmitter::class.java) @@ -58,7 +58,7 @@ class InteropModuleRegistryTest { @Test fun getInteropModule_withRegisteredClassAndValidFlags_returnsInteropModule() { - overrideFeatureFlags(true, true) + overrideFeatureFlags(true) underTest.registerInteropModule(RCTEventEmitter::class.java, FakeRCTEventEmitter()) val interopModule = underTest.getInteropModule(RCTEventEmitter::class.java) @@ -68,18 +68,16 @@ class InteropModuleRegistryTest { @Test fun getInteropModule_withUnregisteredClass_returnsNull() { - overrideFeatureFlags(true, true) + overrideFeatureFlags(true) val missingModule = underTest.getInteropModule(FakeJavaScriptModule::class.java) assertThat(missingModule).isNull() } - private fun overrideFeatureFlags(useFabricInterop: Boolean, enableFabricRenderer: Boolean) { + private fun overrideFeatureFlags(useFabricInterop: Boolean) { ReactNativeFeatureFlags.override( object : ReactNativeFeatureFlagsDefaults() { override fun useFabricInterop(): Boolean = useFabricInterop - - override fun enableFabricRenderer(): Boolean = enableFabricRenderer } ) }