Only load core modules once

Reviewed By: javache, AaaChiuuu Differential Revision: D5303176 fbshipit-source-id: f00ecacaa695ce7a4f8b57c66cee38bb70883cae
facebook · Jun 22, 2017 · 2b89416 · 2b89416
1 parent 4429a8d
commit 2b89416
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -255,6 +255,14 @@ public static ReactInstanceManagerBuilder builder() {
     mUseSeparateUIBackgroundThread = useSeparateUIBackgroundThread;
     mMinNumShakes = minNumShakes;
 
+    CoreModulesPackage coreModulesPackage =
+      new CoreModulesPackage(
+        this,
+        mBackBtnHandler,
+        mUIImplementationProvider,
+        mLazyViewManagersEnabled);
+    mPackages.add(0, coreModulesPackage);
+
     // Instantiate ReactChoreographer in UI thread.
     ReactChoreographer.initialize();
   }
@@ -954,13 +962,6 @@ private ReactApplicationContext createReactContext(
       reactContext.setNativeModuleCallExceptionHandler(mDevSupportManager);
     }
 
-    CoreModulesPackage coreModulesPackage =
-      new CoreModulesPackage(
-        this,
-        mBackBtnHandler,
-        mUIImplementationProvider,
-        mLazyViewManagersEnabled);
-    mPackages.add(0,coreModulesPackage);
     NativeModuleRegistry nativeModuleRegistry = processPackages(reactContext, mPackages, false);
 
     NativeModuleCallExceptionHandler exceptionHandler = mNativeModuleCallExceptionHandler != null