diff --git a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java index 626a99fccd9..c0e8f35cd00 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java +++ b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java @@ -29,11 +29,6 @@ public class ReactFeatureFlags { /** Enable TurboModule JS Codegen. */ public static volatile boolean useTurboModuleJSCodegen = false; - /** - * Enable the fix to validate the TurboReactPackage's module info before resolving a TurboModule. - */ - public static volatile boolean enableTurboModulePackageInfoValidation = false; - /* * This feature flag enables logs for Fabric */ diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/ReactPackageTurboModuleManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/ReactPackageTurboModuleManagerDelegate.java index 74a7ca72d2f..59c2fc9794a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/ReactPackageTurboModuleManagerDelegate.java +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/ReactPackageTurboModuleManagerDelegate.java @@ -15,7 +15,6 @@ import com.facebook.react.TurboReactPackage; import com.facebook.react.bridge.CxxModuleWrapper; import com.facebook.react.bridge.NativeModule; import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.config.ReactFeatureFlags; import com.facebook.react.module.model.ReactModuleInfo; import com.facebook.react.turbomodule.core.interfaces.TurboModule; import java.util.ArrayList; @@ -37,9 +36,7 @@ public abstract class ReactPackageTurboModuleManagerDelegate extends TurboModule if (reactPackage instanceof TurboReactPackage) { TurboReactPackage pkg = (TurboReactPackage) reactPackage; mPackages.add(pkg); - if (ReactFeatureFlags.enableTurboModulePackageInfoValidation) { - mPackageModuleInfos.put(pkg, pkg.getReactModuleInfoProvider().getReactModuleInfos()); - } + mPackageModuleInfos.put(pkg, pkg.getReactModuleInfoProvider().getReactModuleInfos()); } } } @@ -81,23 +78,16 @@ public abstract class ReactPackageTurboModuleManagerDelegate extends TurboModule for (final TurboReactPackage pkg : mPackages) { try { - if (ReactFeatureFlags.enableTurboModulePackageInfoValidation) { - final ReactModuleInfo moduleInfo = mPackageModuleInfos.get(pkg).get(moduleName); - if (moduleInfo == null - || !moduleInfo.isTurboModule() - || resolvedModule != null && !moduleInfo.canOverrideExistingModule()) { - continue; - } + final ReactModuleInfo moduleInfo = mPackageModuleInfos.get(pkg).get(moduleName); + if (moduleInfo == null + || !moduleInfo.isTurboModule() + || resolvedModule != null && !moduleInfo.canOverrideExistingModule()) { + continue; + } - final NativeModule module = pkg.getModule(moduleName, mReactApplicationContext); - if (module != null) { - resolvedModule = module; - } - } else { - final NativeModule module = pkg.getModule(moduleName, mReactApplicationContext); - if (resolvedModule == null || module != null && module.canOverrideExistingModule()) { - resolvedModule = module; - } + final NativeModule module = pkg.getModule(moduleName, mReactApplicationContext); + if (module != null) { + resolvedModule = module; } } catch (IllegalArgumentException ex) { /** diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java index 14700729103..b892f527c0e 100644 --- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java +++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java @@ -206,7 +206,6 @@ public class RNTesterApplication extends Application implements ReactApplication @Override public void onCreate() { ReactFeatureFlags.useTurboModules = BuildConfig.ENABLE_TURBOMODULE; - ReactFeatureFlags.enableTurboModulePackageInfoValidation = true; ReactFontManager.getInstance().addCustomFont(this, "Rubik", R.font.rubik); super.onCreate(); SoLoader.init(this, /* native exopackage */ false);