From 3c12faf01c4fecf77890dfed8118d941b555564a Mon Sep 17 00:00:00 2001 From: Kathy Gray Date: Thu, 17 Aug 2017 06:11:59 -0700 Subject: [PATCH] Restore correct placement of PRE_RUN_JS_BUNDLE_START Reviewed By: alexeylang Differential Revision: D5640104 fbshipit-source-id: f0709f16874cca5147fdfc539727ec4225ca539b --- .../main/java/com/facebook/react/ReactInstanceManager.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index 98921355a..806582761 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -1021,8 +1021,8 @@ public class ReactInstanceManager { if (Systrace.isTracing(TRACE_TAG_REACT_APPS | TRACE_TAG_REACT_JSC_CALLS)) { catalystInstance.setGlobalVariable("__RCTProfileIsProfiling", "true"); } + ReactMarker.logMarker(ReactMarkerConstants.PRE_RUN_JS_BUNDLE_START); catalystInstance.runJSBundle(); - // Transitions functions in the minitFunctions list to catalystInstance, to run after the bundle // TODO T20546472 if (!mInitFunctions.isEmpty()) { @@ -1030,11 +1030,8 @@ public class ReactInstanceManager { ((CatalystInstanceImpl) catalystInstance).callFunction(function); } } - ReactMarker.logMarker(ReactMarkerConstants.PRE_RUN_JS_BUNDLE_START); - reactContext.initializeWithInstance(catalystInstance); - return reactContext; }