react-native 0.0.0-263478b91 → 0.0.0-268efb102

package/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK

@@ -1,4 +1,3 @@
-# BUILD FILE SYNTAX: SKYLARK
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "IS_OSS_BUILD",
@@ -13,11 +12,12 @@ rn_android_library(
     srcs = glob(["*.java"]),
     autoglob = False,
     is_androidx = True,
-    deps = ([
+    deps = [
         react_native_dep("third-party/android/androidx:test-espresso-core"),
         react_native_dep("third-party/java/fest:fest"),
         react_native_dep("third-party/java/junit:junit"),
-        react_native_dep("third-party/java/testing-support-lib:testing-support-lib"),
+        react_native_dep("third-party/android/androidx:test-rules"),
+        react_native_dep("third-party/android/androidx:test-runner"),
         react_native_integration_tests_target("java/com/facebook/react/testing:testing"),
         react_native_integration_tests_target("java/com/facebook/react/testing/rule:rule"),
         react_native_target("java/com/facebook/react:react"),
@@ -27,7 +27,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/model:model"),
         react_native_target("java/com/facebook/react/shell:shell"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
-    ]) + ([
+    ] + [
         react_native_dep("java/com/facebook/fbreact/testing:testing"),
-    ]) if not IS_OSS_BUILD else [],
+    ] if not IS_OSS_BUILD else [],
 )

package/ReactAndroid/src/androidTest/js/BUCK

@@ -0,0 +1,26 @@
+load("//tools/build_defs:js_glob.bzl", "js_glob")
+load("//tools/build_defs/oss:metro_defs.bzl", "rn_library")
+
+# This file was generated by running
+# js1 build buckfiles
+
+rn_library(
+    name = "js",
+    srcs = js_glob(
+        [
+            "**/*",
+        ],
+        excludes = [
+            "**/__*__/**",
+            "**/*.command",
+            "**/*.md",
+        ],
+    ),
+    labels = ["supermodule:xplat/default/public.react_native.tests"],
+    skip_processors = True,
+    visibility = ["PUBLIC"],
+    deps = [
+        "//xplat/js/RKJSModules/vendor/react:react",
+        "//xplat/js/react-native-github:react-native",
+    ],
+)

package/ReactAndroid/src/androidTest/js/TestBundle.js

@@ -20,11 +20,8 @@ require('./TestJSLocaleModule');
 require('./TestJSToJavaParametersModule');
 require('./TestJavaToJSReturnValuesModule');
 require('./UIManagerTestModule');
-
 require('./CatalystRootViewTestModule');
-require('./DatePickerDialogTestModule');
 require('./MeasureLayoutTestModule');
-require('./PickerAndroidTestModule');
 require('./ScrollViewTestModule');
 require('./ShareTestModule');
 require('./SwipeRefreshLayoutTestModule');
@@ -44,11 +41,6 @@ const apps = [
     component: () =>
       require('./CatalystRootViewTestModule').CatalystRootViewTestApp,
   },
-  {
-    appKey: 'DatePickerDialogTestApp',
-    component: () =>
-      require('./DatePickerDialogTestModule').DatePickerDialogTestApp,
-  },
   {
     appKey: 'JSResponderTestApp',
     component: () => require('./JSResponderTestApp'),
@@ -86,10 +78,6 @@ const apps = [
     appKey: 'NativeIdTestApp',
     component: () => require('./NativeIdTestModule').NativeIdTestApp,
   },
-  {
-    appKey: 'PickerAndroidTestApp',
-    component: () => require('./PickerAndroidTestModule').PickerAndroidTestApp,
-  },
   {
     appKey: 'ScrollViewTestApp',
     component: () => require('./ScrollViewTestModule').ScrollViewTestApp,

package/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk

@@ -18,8 +18,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-no
 
 LOCAL_CPP_FEATURES := exceptions
 
-LOCAL_STATIC_LIBRARIES := libjsireact libjsi
-LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes
+LOCAL_STATIC_LIBRARIES := libjsireact
+LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes libjsi
 
 include $(BUILD_SHARED_LIBRARY)
 

package/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk

@@ -17,8 +17,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-no
 
 LOCAL_CPP_FEATURES := exceptions
 
-LOCAL_STATIC_LIBRARIES := libjsireact libjsi libhermes-executor-common-release
-LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes
+LOCAL_STATIC_LIBRARIES := libjsireact libhermes-executor-common-release
+LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes libjsi
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -34,7 +34,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-no
 
 LOCAL_CPP_FEATURES := exceptions
 
-LOCAL_STATIC_LIBRARIES := libjsireact libjsi libhermes-executor-common-debug libhermes-inspector
-LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes
+LOCAL_STATIC_LIBRARIES := libjsireact libhermes-executor-common-debug libhermes-inspector
+LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes libjsi
 
 include $(BUILD_SHARED_LIBRARY)

package/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutorFactory.java

@@ -17,7 +17,7 @@ public class HermesExecutorFactory implements JavaScriptExecutorFactory {
   private final RuntimeConfig mConfig;
 
   public HermesExecutorFactory() {
-    this(new RuntimeConfig(1024));
+    this(null);
   }
 
   public HermesExecutorFactory(RuntimeConfig config) {

package/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/RuntimeConfig.java

@@ -10,10 +10,4 @@ package com.facebook.hermes.reactexecutor;
 /** Holds runtime configuration for a Hermes VM instance (master or snapshot). */
 public final class RuntimeConfig {
   public long heapSizeMB;
-
-  RuntimeConfig() {}
-
-  RuntimeConfig(long heapSizeMB) {
-    this.heapSizeMB = heapSizeMB;
-  }
 }

package/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK

@@ -9,8 +9,8 @@ rn_prebuilt_jar(
 
 fb_native.remote_file(
     name = "annotations-binary.jar",
-    sha1 = "95ff77fd4870136a0454dd7ccad8813db87bd9ab",
-    url = "https://jcenter.bintray.com/com/facebook/yoga/proguard-annotations/1.17.0/proguard-annotations-1.17.0.jar",
+    sha1 = "fcbbb39052e6490eaaf6a6959c49c3a4fbe87c63",
+    url = "mvn:com.facebook.yoga:proguard-annotations:jar:1.19.0",
 )
 
 rn_android_library(

package/ReactAndroid/src/main/java/com/facebook/react/BUCK

@@ -13,6 +13,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:fragment"),
         react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
+        react_native_dep("third-party/android/androidx:autofill"),
     ],
     visibility = [
         "PUBLIC",

package/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java

@@ -65,6 +65,7 @@ public abstract class ReactActivity extends AppCompatActivity
 
   @Override
   public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    super.onActivityResult(requestCode, resultCode, data);
     mDelegate.onActivityResult(requestCode, resultCode, data);
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.java

@@ -29,10 +29,15 @@ public class ReactAndroidHWInputDeviceHelper {
           .put(KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, "playPause")
           .put(KeyEvent.KEYCODE_MEDIA_REWIND, "rewind")
           .put(KeyEvent.KEYCODE_MEDIA_FAST_FORWARD, "fastForward")
+          .put(KeyEvent.KEYCODE_MEDIA_STOP, "stop")
+          .put(KeyEvent.KEYCODE_MEDIA_NEXT, "next")
+          .put(KeyEvent.KEYCODE_MEDIA_PREVIOUS, "previous")
           .put(KeyEvent.KEYCODE_DPAD_UP, "up")
           .put(KeyEvent.KEYCODE_DPAD_RIGHT, "right")
           .put(KeyEvent.KEYCODE_DPAD_DOWN, "down")
           .put(KeyEvent.KEYCODE_DPAD_LEFT, "left")
+          .put(KeyEvent.KEYCODE_INFO, "info")
+          .put(KeyEvent.KEYCODE_MENU, "menu")
           .build();
 
   /**

package/ReactAndroid/src/main/java/com/facebook/react/ReactFragment.java

@@ -27,8 +27,8 @@ import com.facebook.react.modules.core.PermissionListener;
  */
 public class ReactFragment extends Fragment implements PermissionAwareActivity {
 
-  private static final String ARG_COMPONENT_NAME = "arg_component_name";
-  private static final String ARG_LAUNCH_OPTIONS = "arg_launch_options";
+  protected static final String ARG_COMPONENT_NAME = "arg_component_name";
+  protected static final String ARG_LAUNCH_OPTIONS = "arg_launch_options";
 
   private ReactDelegate mReactDelegate;
 
@@ -79,6 +79,10 @@ public class ReactFragment extends Fragment implements PermissionAwareActivity {
     return ((ReactApplication) getActivity().getApplication()).getReactNativeHost();
   }
 
+  protected ReactDelegate getReactDelegate() {
+    return mReactDelegate;
+  }
+
   @Override
   public View onCreateView(
       LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {

package/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

@@ -65,10 +65,11 @@ import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
 import com.facebook.react.bridge.ProxyJavaScriptExecutor;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReactCxxErrorHandler;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
 import com.facebook.react.bridge.ReactNoCrashSoftException;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableNativeMap;
@@ -106,6 +107,7 @@ import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper;
 import com.facebook.soloader.SoLoader;
 import com.facebook.systrace.Systrace;
 import com.facebook.systrace.SystraceMessage;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -155,12 +157,14 @@ public class ReactInstanceManager {
   /* accessed from any thread */
   private final JavaScriptExecutorFactory mJavaScriptExecutorFactory;
 
+  // See {@code ReactInstanceManagerBuilder} for description of all flags here.
   private @Nullable List<String> mViewManagerNames = null;
   private final @Nullable JSBundleLoader mBundleLoader;
   private final @Nullable String mJSMainModulePath; /* path to JS bundle root on Metro */
   private final List<ReactPackage> mPackages;
   private final DevSupportManager mDevSupportManager;
   private final boolean mUseDeveloperSupport;
+  private final boolean mRequireActivity;
   private @Nullable ComponentNameResolverManager mComponentNameResolverManager;
   private final @Nullable NotThreadSafeBridgeIdleDebugListener mBridgeIdleDebugListener;
   private final Object mReactContextLock = new Object();
@@ -180,6 +184,7 @@ public class ReactInstanceManager {
   private final @Nullable JSIModulePackage mJSIModulePackage;
   private final @Nullable ReactPackageTurboModuleManagerDelegate.Builder mTMMDelegateBuilder;
   private List<ViewManager> mViewManagers;
+  private boolean mUseFallbackBundle = false;
 
   private class ReactContextInitParams {
     private final JavaScriptExecutorFactory mJsExecutorFactory;
@@ -214,6 +219,8 @@ public class ReactInstanceManager {
       @Nullable String jsMainModulePath,
       List<ReactPackage> packages,
       boolean useDeveloperSupport,
+      DevSupportManagerFactory devSupportManagerFactory,
+      boolean requireActivity,
       @Nullable NotThreadSafeBridgeIdleDebugListener bridgeIdleDebugListener,
       LifecycleState initialLifecycleState,
       @Nullable UIImplementationProvider mUIImplementationProvider,
@@ -231,6 +238,7 @@ public class ReactInstanceManager {
 
     DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(applicationContext);
 
+    // See {@code ReactInstanceManagerBuilder} for description of all flags here.
     mApplicationContext = applicationContext;
     mCurrentActivity = currentActivity;
     mDefaultBackButtonImpl = defaultHardwareBackBtnHandler;
@@ -239,10 +247,11 @@ public class ReactInstanceManager {
     mJSMainModulePath = jsMainModulePath;
     mPackages = new ArrayList<>();
     mUseDeveloperSupport = useDeveloperSupport;
+    mRequireActivity = requireActivity;
     Systrace.beginSection(
         Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "ReactInstanceManager.initDevSupportManager");
     mDevSupportManager =
-        DevSupportManagerFactory.create(
+        devSupportManagerFactory.create(
             applicationContext,
             createDevHelperInterface(),
             mJSMainModulePath,
@@ -284,6 +293,8 @@ public class ReactInstanceManager {
     if (mUseDeveloperSupport) {
       mDevSupportManager.startInspector();
     }
+
+    registerCxxErrorHandlerFunc();
   }
 
   private ReactInstanceDevHelper createDevHelperInterface() {
@@ -341,6 +352,10 @@ public class ReactInstanceManager {
     };
   }
 
+  public synchronized void setUseFallbackBundle(boolean useFallbackBundle) {
+    mUseFallbackBundle = useFallbackBundle;
+  }
+
   private JavaScriptExecutorFactory getJSExecutorFactory() {
     return mJavaScriptExecutorFactory;
   }
@@ -357,6 +372,22 @@ public class ReactInstanceManager {
     return new ArrayList<>(mPackages);
   }
 
+  public void handleCxxError(Exception e) {
+    mDevSupportManager.handleException(e);
+  }
+
+  public void registerCxxErrorHandlerFunc() {
+    Class[] parameterTypes = new Class[1];
+    parameterTypes[0] = Exception.class;
+    Method handleCxxErrorFunc = null;
+    try {
+      handleCxxErrorFunc = ReactInstanceManager.class.getMethod("handleCxxError", parameterTypes);
+    } catch (NoSuchMethodException e) {
+      FLog.e("ReactInstanceHolder", "Failed to set cxx error hanlder function", e);
+    }
+    ReactCxxErrorHandler.setHandleErrorFunc(this, handleCxxErrorFunc);
+  }
+
   static void initializeSoLoaderIfNecessary(Context applicationContext) {
     // Call SoLoader.initialize here, this is required for apps that does not use exopackage and
     // does not use SoLoader for loading other native code except from the one used by React Native
@@ -427,7 +458,8 @@ public class ReactInstanceManager {
                           if (packagerIsRunning) {
                             mDevSupportManager.handleReloadJS();
                           } else if (mDevSupportManager.hasUpToDateJSBundleInCache()
-                              && !devSettings.isRemoteJSDebugEnabled()) {
+                              && !devSettings.isRemoteJSDebugEnabled()
+                              && !mUseFallbackBundle) {
                             // If there is a up-to-date bundle downloaded from server,
                             // with remote JS debugging disabled, always use that.
                             onJSBundleLoadedFromServer();
@@ -522,7 +554,7 @@ public class ReactInstanceManager {
           .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
           .emit("toggleElementInspector", null);
     } else {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           TAG,
           new ReactNoCrashSoftException(
               "Cannot toggleElementInspector, CatalystInstance not available"));
@@ -556,16 +588,20 @@ public class ReactInstanceManager {
    * @param activity the activity being paused
    */
   @ThreadConfined(UI)
-  public void onHostPause(Activity activity) {
-    Assertions.assertNotNull(mCurrentActivity);
-    Assertions.assertCondition(
-        activity == mCurrentActivity,
-        "Pausing an activity that is not the current activity, this is incorrect! "
-            + "Current activity: "
-            + mCurrentActivity.getClass().getSimpleName()
-            + " "
-            + "Paused activity: "
-            + activity.getClass().getSimpleName());
+  public void onHostPause(@Nullable Activity activity) {
+    if (mRequireActivity) {
+      Assertions.assertCondition(mCurrentActivity != null);
+    }
+    if (mCurrentActivity != null) {
+      Assertions.assertCondition(
+          activity == mCurrentActivity,
+          "Pausing an activity that is not the current activity, this is incorrect! "
+              + "Current activity: "
+              + mCurrentActivity.getClass().getSimpleName()
+              + " "
+              + "Paused activity: "
+              + activity.getClass().getSimpleName());
+    }
     onHostPause();
   }
 
@@ -581,7 +617,8 @@ public class ReactInstanceManager {
    *     this instance of {@link ReactInstanceManager}.
    */
   @ThreadConfined(UI)
-  public void onHostResume(Activity activity, DefaultHardwareBackBtnHandler defaultBackButtonImpl) {
+  public void onHostResume(
+      @Nullable Activity activity, DefaultHardwareBackBtnHandler defaultBackButtonImpl) {
     UiThreadUtil.assertOnUiThread();
 
     mDefaultBackButtonImpl = defaultBackButtonImpl;
@@ -590,40 +627,47 @@ public class ReactInstanceManager {
 
   /** Use this method when the activity resumes. */
   @ThreadConfined(UI)
-  public void onHostResume(Activity activity) {
+  public void onHostResume(@Nullable Activity activity) {
     UiThreadUtil.assertOnUiThread();
 
     mCurrentActivity = activity;
 
     if (mUseDeveloperSupport) {
-      // Resume can be called from one of two different states:
+      // Resume can be called from one of three different states:
       // a) when activity was paused
       // b) when activity has just been created
+      // c) when there is no activity
       // In case of (a) the activity is attached to window and it is ok to add new views to it or
       // open dialogs. In case of (b) there is often a slight delay before such a thing happens.
       // As dev support manager can add views or open dialogs immediately after it gets enabled
       // (e.g. in the case when JS bundle is being fetched in background) we only want to enable
       // it once we know for sure the current activity is attached.
+      // We want to enable the various devsupport tools in case of (c) even without any activity
+
+      if (mCurrentActivity != null) {
+        // We check if activity is attached to window by checking if decor view is attached
+        final View decorView = mCurrentActivity.getWindow().getDecorView();
+        if (!ViewCompat.isAttachedToWindow(decorView)) {
+          decorView.addOnAttachStateChangeListener(
+              new View.OnAttachStateChangeListener() {
+                @Override
+                public void onViewAttachedToWindow(View v) {
+                  // we can drop listener now that we know the view is attached
+                  decorView.removeOnAttachStateChangeListener(this);
+                  mDevSupportManager.setDevSupportEnabled(true);
+                }
 
-      // We check if activity is attached to window by checking if decor view is attached
-      final View decorView = mCurrentActivity.getWindow().getDecorView();
-      if (!ViewCompat.isAttachedToWindow(decorView)) {
-        decorView.addOnAttachStateChangeListener(
-            new View.OnAttachStateChangeListener() {
-              @Override
-              public void onViewAttachedToWindow(View v) {
-                // we can drop listener now that we know the view is attached
-                decorView.removeOnAttachStateChangeListener(this);
-                mDevSupportManager.setDevSupportEnabled(true);
-              }
-
-              @Override
-              public void onViewDetachedFromWindow(View v) {
-                // do nothing
-              }
-            });
-      } else {
-        // activity is attached to window, we can enable dev support immediately
+                @Override
+                public void onViewDetachedFromWindow(View v) {
+                  // do nothing
+                }
+              });
+        } else {
+          // activity is attached to window, we can enable dev support immediately
+          mDevSupportManager.setDevSupportEnabled(true);
+        }
+      } else if (!mRequireActivity) {
+        // there is no activity, but we can enable dev support
         mDevSupportManager.setDevSupportEnabled(true);
       }
     }
@@ -657,7 +701,9 @@ public class ReactInstanceManager {
    * @param activity the activity being destroyed
    */
   @ThreadConfined(UI)
-  public void onHostDestroy(Activity activity) {
+  public void onHostDestroy(@Nullable Activity activity) {
+    // In some cases, Activity may (correctly) be null.
+    // See mRequireActivity flag.
     if (activity == mCurrentActivity) {
       onHostDestroy();
     }
@@ -915,38 +961,40 @@ public class ReactInstanceManager {
 
   public @Nullable List<String> getViewManagerNames() {
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "ReactInstanceManager.getViewManagerNames");
-    if (mViewManagerNames == null) {
-      ReactApplicationContext context;
-      synchronized (mReactContextLock) {
-        context = (ReactApplicationContext) getCurrentReactContext();
-        if (context == null || !context.hasActiveReactInstance()) {
-          return null;
-        }
+    List<String> viewManagerNames = mViewManagerNames;
+    if (viewManagerNames != null) {
+      return viewManagerNames;
+    }
+    ReactApplicationContext context;
+    synchronized (mReactContextLock) {
+      context = (ReactApplicationContext) getCurrentReactContext();
+      if (context == null || !context.hasActiveReactInstance()) {
+        return null;
       }
+    }
 
-      synchronized (mPackages) {
-        if (mViewManagerNames == null) {
-          Set<String> uniqueNames = new HashSet<>();
-          for (ReactPackage reactPackage : mPackages) {
-            SystraceMessage.beginSection(
-                    TRACE_TAG_REACT_JAVA_BRIDGE, "ReactInstanceManager.getViewManagerName")
-                .arg("Package", reactPackage.getClass().getSimpleName())
-                .flush();
-            if (reactPackage instanceof ViewManagerOnDemandReactPackage) {
-              List<String> names =
-                  ((ViewManagerOnDemandReactPackage) reactPackage).getViewManagerNames(context);
-              if (names != null) {
-                uniqueNames.addAll(names);
-              }
+    synchronized (mPackages) {
+      if (mViewManagerNames == null) {
+        Set<String> uniqueNames = new HashSet<>();
+        for (ReactPackage reactPackage : mPackages) {
+          SystraceMessage.beginSection(
+                  TRACE_TAG_REACT_JAVA_BRIDGE, "ReactInstanceManager.getViewManagerName")
+              .arg("Package", reactPackage.getClass().getSimpleName())
+              .flush();
+          if (reactPackage instanceof ViewManagerOnDemandReactPackage) {
+            List<String> names =
+                ((ViewManagerOnDemandReactPackage) reactPackage).getViewManagerNames(context);
+            if (names != null) {
+              uniqueNames.addAll(names);
             }
-            SystraceMessage.endSection(TRACE_TAG_REACT_JAVA_BRIDGE).flush();
           }
-          Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
-          mViewManagerNames = new ArrayList<>(uniqueNames);
+          SystraceMessage.endSection(TRACE_TAG_REACT_JAVA_BRIDGE).flush();
         }
+        Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
+        mViewManagerNames = new ArrayList<>(uniqueNames);
       }
+      return mViewManagerNames;
     }
-    return new ArrayList<>(mViewManagerNames);
   }
 
   /** Add a listener to be notified of react instance events. */
@@ -1178,7 +1226,8 @@ public class ReactInstanceManager {
     // If we can't get a UIManager something has probably gone horribly wrong
     if (uiManager == null) {
       throw new IllegalStateException(
-          "Unable to attach a rootView to ReactInstance when UIManager is not properly initialized.");
+          "Unable to attach a rootView to ReactInstance when UIManager is not properly"
+              + " initialized.");
     }
 
     @Nullable Bundle initialProperties = reactRoot.getAppProperties();
@@ -1319,6 +1368,10 @@ public class ReactInstanceManager {
       }
     }
 
+    if (ReactFeatureFlags.enableRuntimeScheduler) {
+      catalystInstance.installRuntimeScheduler();
+    }
+
     if (mJSIModulePackage != null) {
       catalystInstance.addJSIModules(
           mJSIModulePackage.getJSIModules(
@@ -1340,11 +1393,17 @@ public class ReactInstanceManager {
               new ComponentNameResolver() {
                 @Override
                 public String[] getComponentNames() {
-                  return getViewManagerNames().toArray(new String[0]);
+                  List<String> viewManagerNames = getViewManagerNames();
+                  if (viewManagerNames == null) {
+                    FLog.e(TAG, "No ViewManager names found");
+                    return new String[0];
+                  }
+                  return viewManagerNames.toArray(new String[0]);
                 }
               });
       catalystInstance.setGlobalVariable("__fbStaticViewConfig", "true");
     }
+
     ReactMarker.logMarker(ReactMarkerConstants.PRE_RUN_JS_BUNDLE_START);
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "runJSBundle");
     catalystInstance.runJSBundle();

package/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java

@@ -22,6 +22,8 @@ import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.NativeModuleCallExceptionHandler;
 import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
 import com.facebook.react.common.LifecycleState;
+import com.facebook.react.devsupport.DefaultDevSupportManagerFactory;
+import com.facebook.react.devsupport.DevSupportManagerFactory;
 import com.facebook.react.devsupport.RedBoxHandler;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
@@ -45,6 +47,8 @@ public class ReactInstanceManagerBuilder {
   private @Nullable NotThreadSafeBridgeIdleDebugListener mBridgeIdleDebugListener;
   private @Nullable Application mApplication;
   private boolean mUseDeveloperSupport;
+  private @Nullable DevSupportManagerFactory mDevSupportManagerFactory;
+  private boolean mRequireActivity;
   private @Nullable LifecycleState mInitialLifecycleState;
   private @Nullable UIImplementationProvider mUIImplementationProvider;
   private @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
@@ -171,6 +175,26 @@ public class ReactInstanceManagerBuilder {
     return this;
   }
 
+  /**
+   * Set the custom {@link DevSupportManagerFactory}. If not set, will use {@link
+   * DefaultDevSupportManagerFactory}.
+   */
+  public ReactInstanceManagerBuilder setDevSupportManagerFactory(
+      final DevSupportManagerFactory devSupportManagerFactory) {
+    mDevSupportManagerFactory = devSupportManagerFactory;
+    return this;
+  }
+
+  /**
+   * When {@code false}, indicates that correct usage of React Native will NOT involve an Activity.
+   * For the vast majority of Android apps in the ecosystem, this will not need to change. Unless
+   * you really know what you're doing, you should probably not change this!
+   */
+  public ReactInstanceManagerBuilder setRequireActivity(boolean requireActivity) {
+    mRequireActivity = requireActivity;
+    return this;
+  }
+
   /**
    * Sets the initial lifecycle state of the host. For example, if the host is already resumed at
    * creation time, we wouldn't expect an onResume call until we get an onPause call.
@@ -283,6 +307,10 @@ public class ReactInstanceManagerBuilder {
         mJSMainModulePath,
         mPackages,
         mUseDeveloperSupport,
+        mDevSupportManagerFactory == null
+            ? new DefaultDevSupportManagerFactory()
+            : mDevSupportManagerFactory,
+        mRequireActivity,
         mBridgeIdleDebugListener,
         Assertions.assertNotNull(mInitialLifecycleState, "Initial lifecycle state was not set"),
         mUIImplementationProvider,