diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index 9c53e21b59e..17102713351 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -89,7 +89,6 @@ import com.facebook.react.devsupport.interfaces.PackagerStatusCallback; import com.facebook.react.devsupport.interfaces.RedBoxHandler; import com.facebook.react.internal.turbomodule.core.TurboModuleManager; import com.facebook.react.internal.turbomodule.core.TurboModuleManagerDelegate; -import com.facebook.react.internal.turbomodule.core.interfaces.TurboModuleRegistry; import com.facebook.react.modules.appearance.AppearanceModule; import com.facebook.react.modules.appregistry.AppRegistry; import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler; @@ -1340,7 +1339,7 @@ public class ReactInstanceManager { mJSExceptionHandler != null ? mJSExceptionHandler : mDevSupportManager; reactContext.setJSExceptionHandler(exceptionHandler); - NativeModuleRegistry nativeModuleRegistry = processPackages(reactContext, mPackages, false); + NativeModuleRegistry nativeModuleRegistry = processPackages(reactContext, mPackages); CatalystInstanceImpl.Builder catalystInstanceBuilder = new CatalystInstanceImpl.Builder() @@ -1386,11 +1385,9 @@ public class ReactInstanceManager { catalystInstance.setTurboModuleManager(turboModuleManager); - TurboModuleRegistry registry = (TurboModuleRegistry) turboModuleManager; - // Eagerly initialize TurboModules - for (String moduleName : registry.getEagerInitModuleNames()) { - registry.getModule(moduleName); + for (String moduleName : turboModuleManager.getEagerInitModuleNames()) { + turboModuleManager.getModule(moduleName); } } @@ -1418,9 +1415,7 @@ public class ReactInstanceManager { } private NativeModuleRegistry processPackages( - ReactApplicationContext reactContext, - List packages, - boolean checkAndUpdatePackageMembership) { + ReactApplicationContext reactContext, List packages) { NativeModuleRegistryBuilder nativeModuleRegistryBuilder = new NativeModuleRegistryBuilder(reactContext, this); @@ -1428,14 +1423,8 @@ public class ReactInstanceManager { synchronized (mPackages) { for (ReactPackage reactPackage : packages) { - if (checkAndUpdatePackageMembership && mPackages.contains(reactPackage)) { - continue; - } Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "createAndProcessCustomReactPackage"); try { - if (checkAndUpdatePackageMembership) { - mPackages.add(reactPackage); - } processPackage(reactPackage, nativeModuleRegistryBuilder); } finally { Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);