react-native 0.0.0-e6fc20ee6 → 0.0.0-e9440508e-20211011-2008

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java

@@ -63,6 +63,7 @@ public class ReactContext extends ContextWrapper {
   private @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
   private @Nullable NativeModuleCallExceptionHandler mExceptionHandlerWrapper;
   private @Nullable WeakReference<Activity> mCurrentActivity;
+  private boolean mIsInitialized = false;
 
   public ReactContext(Context base) {
     super(base);
@@ -77,7 +78,7 @@ public class ReactContext extends ContextWrapper {
       throw new IllegalStateException("ReactContext has been already initialized");
     }
     if (mDestroyed) {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           TAG,
           new IllegalStateException("Cannot initialize ReactContext after it has been destroyed."));
     }
@@ -88,11 +89,8 @@ public class ReactContext extends ContextWrapper {
     initializeMessageQueueThreads(queueConfig);
   }
 
-  /**
-   * Initialize message queue threads using a ReactQueueConfiguration. TODO (janzer) T43898341 Make
-   * this package instead of public
-   */
-  public void initializeMessageQueueThreads(ReactQueueConfiguration queueConfig) {
+  /** Initialize message queue threads using a ReactQueueConfiguration. */
+  public synchronized void initializeMessageQueueThreads(ReactQueueConfiguration queueConfig) {
     if (mUiMessageQueueThread != null
         || mNativeModulesMessageQueueThread != null
         || mJSMessageQueueThread != null) {
@@ -101,6 +99,18 @@ public class ReactContext extends ContextWrapper {
     mUiMessageQueueThread = queueConfig.getUIQueueThread();
     mNativeModulesMessageQueueThread = queueConfig.getNativeModulesQueueThread();
     mJSMessageQueueThread = queueConfig.getJSQueueThread();
+
+    /** TODO(T85807990): Fail fast if any of the threads is null. */
+    if (mUiMessageQueueThread == null) {
+      throw new IllegalStateException("UI thread is null");
+    }
+    if (mNativeModulesMessageQueueThread == null) {
+      throw new IllegalStateException("NativeModules thread is null");
+    }
+    if (mJSMessageQueueThread == null) {
+      throw new IllegalStateException("JavaScript thread is null");
+    }
+    mIsInitialized = true;
   }
 
   public void resetPerfStats() {
@@ -170,7 +180,19 @@ public class ReactContext extends ContextWrapper {
     return Assertions.assertNotNull(mCatalystInstance);
   }
 
+  /**
+   * This API has been deprecated due to naming consideration, please use hasActiveReactInstance()
+   * instead
+   *
+   * @return
+   */
+  @Deprecated
   public boolean hasActiveCatalystInstance() {
+    return hasActiveReactInstance();
+  }
+
+  /** @return true if there is an non-null, alive react native instance */
+  public boolean hasActiveReactInstance() {
     return mCatalystInstance != null && !mCatalystInstance.isDestroyed();
   }
 
@@ -184,7 +206,7 @@ public class ReactContext extends ContextWrapper {
 
   public void addLifecycleEventListener(final LifecycleEventListener listener) {
     mLifecycleEventListeners.add(listener);
-    if (hasActiveCatalystInstance()) {
+    if (hasActiveReactInstance() || isBridgeless()) {
       switch (mLifecycleState) {
         case BEFORE_CREATE:
         case BEFORE_RESUME:
@@ -296,9 +318,11 @@ public class ReactContext extends ContextWrapper {
     mDestroyed = true;
     if (mCatalystInstance != null) {
       mCatalystInstance.destroy();
-      if (ReactFeatureFlags.nullifyCatalystInstanceOnDestroy) {
-        mCatalystInstance = null;
-      }
+    }
+    if (ReactFeatureFlags.enableReactContextCleanupFix) {
+      mLifecycleEventListeners.clear();
+      mActivityEventListeners.clear();
+      mWindowFocusEventListeners.clear();
     }
   }
 
@@ -338,10 +362,20 @@ public class ReactContext extends ContextWrapper {
   }
 
   public void assertOnNativeModulesQueueThread() {
+    /** TODO(T85807990): Fail fast if the ReactContext isn't initialized */
+    if (!mIsInitialized) {
+      throw new IllegalStateException(
+          "Tried to call assertOnNativeModulesQueueThread() on an uninitialized ReactContext");
+    }
     Assertions.assertNotNull(mNativeModulesMessageQueueThread).assertIsOnThread();
   }
 
   public void assertOnNativeModulesQueueThread(String message) {
+    /** TODO(T85807990): Fail fast if the ReactContext isn't initialized */
+    if (!mIsInitialized) {
+      throw new IllegalStateException(
+          "Tried to call assertOnNativeModulesQueueThread(message) on an uninitialized ReactContext");
+    }
     Assertions.assertNotNull(mNativeModulesMessageQueueThread).assertIsOnThread(message);
   }
 
@@ -449,8 +483,8 @@ public class ReactContext extends ContextWrapper {
     return mCatalystInstance.getJavaScriptContextHolder();
   }
 
-  public JSIModule getJSIModule(JSIModuleType moduleType) {
-    if (!hasActiveCatalystInstance()) {
+  public @Nullable JSIModule getJSIModule(JSIModuleType moduleType) {
+    if (!hasActiveReactInstance()) {
       throw new IllegalStateException(
           "Unable to retrieve a JSIModule if CatalystInstance is not active.");
     }
@@ -466,4 +500,16 @@ public class ReactContext extends ContextWrapper {
   public @Nullable String getSourceURL() {
     return mCatalystInstance.getSourceURL();
   }
+
+  /**
+   * Register a JS segment after loading it from cache or server, make sure mCatalystInstance is
+   * properly initialised and not null before calling.
+   *
+   * @param segmentId
+   * @param path
+   */
+  public void registerSegment(int segmentId, String path, Callback callback) {
+    Assertions.assertNotNull(mCatalystInstance).registerSegment(segmentId, path);
+    Assertions.assertNotNull(callback).invoke();
+  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java

@@ -52,8 +52,7 @@ public abstract class ReactContextBaseJavaModule extends BaseJavaModule {
    */
   @ThreadConfined(ANY)
   protected @Nullable final ReactApplicationContext getReactApplicationContextIfActiveOrWarn() {
-    if (mReactApplicationContext.hasActiveCatalystInstance()
-        || mReactApplicationContext.isBridgeless()) {
+    if (mReactApplicationContext.hasActiveReactInstance()) {
       return mReactApplicationContext;
     }
 
@@ -64,7 +63,7 @@ public abstract class ReactContextBaseJavaModule extends BaseJavaModule {
     if (ReactBuildConfig.DEBUG) {
       FLog.w(tag, msg);
     } else {
-      ReactSoftException.logSoftException(tag, new RuntimeException(msg));
+      ReactSoftExceptionLogger.logSoftException(tag, new RuntimeException(msg));
     }
     return null;
   }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCxxErrorHandler.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.bridge;
+
+import com.facebook.common.logging.FLog;
+import com.facebook.proguard.annotations.DoNotStrip;
+import java.lang.reflect.Method;
+
+@DoNotStrip
+public class ReactCxxErrorHandler {
+
+  private static Method mHandleErrorFunc;
+  private static Object mObject;
+
+  @DoNotStrip
+  public static void setHandleErrorFunc(Object object, Method handleErrorFunc) {
+    mObject = object;
+    mHandleErrorFunc = handleErrorFunc;
+  }
+
+  @DoNotStrip
+  // For use from within the C++ JReactCxxErrorHandler
+  private static void handleError(final String message) {
+    if (mHandleErrorFunc != null) {
+      try {
+        Object[] parameters = new Object[1];
+        parameters[0] = new Exception(message);
+        mHandleErrorFunc.invoke(mObject, parameters);
+      } catch (Exception e) {
+        FLog.e("ReactCxxErrorHandler", "Failed to invole error hanlder function", e);
+      }
+    }
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactIgnorableMountingException.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.bridge;
+
+/**
+ * If thrown during a MountItem execution, FabricUIManager will print diagnostics and ignore the
+ * error. Use this carefully and sparingly!
+ */
+public class ReactIgnorableMountingException extends RuntimeException {
+  public ReactIgnorableMountingException(String m) {
+    super(m);
+  }
+
+  public ReactIgnorableMountingException(String m, Throwable e) {
+    super(m, e);
+  }
+
+  public ReactIgnorableMountingException(Throwable e) {
+    super(e);
+  }
+
+  public static boolean isIgnorable(Throwable e) {
+    while (e != null) {
+      if (e instanceof ReactIgnorableMountingException) {
+        return true;
+      }
+      e = e.getCause();
+    }
+    return false;
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java

@@ -94,6 +94,12 @@ public enum ReactMarkerConstants {
   JAVASCRIPT_EXECUTOR_FACTORY_INJECT_END,
   LOAD_REACT_NATIVE_SO_FILE_START,
   LOAD_REACT_NATIVE_SO_FILE_END,
+  ROOT_VIEW_ON_MEASURE_START,
+  ROOT_VIEW_ON_MEASURE_END,
+  ROOT_VIEW_ATTACH_TO_REACT_INSTANCE_MANAGER_START,
+  ROOT_VIEW_ATTACH_TO_REACT_INSTANCE_MANAGER_END,
+  ROOT_VIEW_UPDATE_LAYOUT_SPECS_START,
+  ROOT_VIEW_UPDATE_LAYOUT_SPECS_END,
   // Fabric-specific constants below this line
   LOAD_REACT_NATIVE_FABRIC_SO_FILE_START,
   LOAD_REACT_NATIVE_FABRIC_SO_FILE_END,
@@ -108,5 +114,12 @@ public enum ReactMarkerConstants {
   FABRIC_BATCH_EXECUTION_START,
   FABRIC_BATCH_EXECUTION_END,
   FABRIC_UPDATE_UI_MAIN_THREAD_START,
-  FABRIC_UPDATE_UI_MAIN_THREAD_END
+  FABRIC_UPDATE_UI_MAIN_THREAD_END,
+  // New markers used by bridge and bridgeless loading below this line
+  REACT_BRIDGE_LOADING_START,
+  REACT_BRIDGE_LOADING_END,
+  REACT_BRIDGELESS_LOADING_START,
+  REACT_BRIDGELESS_LOADING_END,
+  LOAD_REACT_NATIVE_MAPBUFFER_SO_FILE_START,
+  LOAD_REACT_NATIVE_MAPBUFFER_SO_FILE_END,
 }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactSoftExceptionLogger.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.bridge;
+
+import com.facebook.common.logging.FLog;
+import com.facebook.proguard.annotations.DoNotStrip;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+@DoNotStrip
+public class ReactSoftExceptionLogger {
+  public interface ReactSoftExceptionListener {
+    void logSoftException(final String category, final Throwable cause);
+  }
+
+  // Use a list instead of a set here because we expect the number of listeners
+  // to be very small, and we want listeners to be called in a deterministic
+  // order.
+  private static final List<ReactSoftExceptionListener> sListeners = new CopyOnWriteArrayList<>();
+
+  @DoNotStrip
+  public static void addListener(ReactSoftExceptionListener listener) {
+    if (!sListeners.contains(listener)) {
+      sListeners.add(listener);
+    }
+  }
+
+  @DoNotStrip
+  public static void removeListener(ReactSoftExceptionListener listener) {
+    sListeners.remove(listener);
+  }
+
+  @DoNotStrip
+  public static void clearListeners() {
+    sListeners.clear();
+  }
+
+  @DoNotStrip
+  public static void logSoftException(final String category, final Throwable cause) {
+    if (sListeners.size() > 0) {
+      for (ReactSoftExceptionListener listener : sListeners) {
+        listener.logSoftException(category, cause);
+      }
+    } else {
+      FLog.e(category, "Unhandled SoftException", cause);
+    }
+  }
+
+  @DoNotStrip
+  // For use from within the C++ JReactSoftExceptionLogger
+  private static void logNoThrowSoftExceptionWithMessage(
+      final String category, final String message) {
+    logSoftException(category, new ReactNoCrashSoftException(message));
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableArray.java

@@ -8,7 +8,6 @@
 package com.facebook.react.bridge;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import java.util.ArrayList;
 
 /**
@@ -27,13 +26,13 @@ public interface ReadableArray {
 
   int getInt(int index);
 
-  @Nullable
+  @NonNull
   String getString(int index);
 
-  @Nullable
+  @NonNull
   ReadableArray getArray(int index);
 
-  @Nullable
+  @NonNull
   ReadableMap getMap(int index);
 
   @NonNull

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.java

@@ -98,17 +98,17 @@ public class ReadableNativeArray extends NativeArray implements ReadableArray {
   }
 
   @Override
-  public @Nullable String getString(int index) {
+  public @NonNull String getString(int index) {
     return (String) getLocalArray()[index];
   }
 
   @Override
-  public @Nullable ReadableNativeArray getArray(int index) {
+  public @NonNull ReadableNativeArray getArray(int index) {
     return (ReadableNativeArray) getLocalArray()[index];
   }
 
   @Override
-  public @Nullable ReadableNativeMap getMap(int index) {
+  public @NonNull ReadableNativeMap getMap(int index) {
     return (ReadableNativeMap) getLocalArray()[index];
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java

@@ -120,7 +120,7 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
     if (hasKey(name)) {
       return getLocalMap().get(name);
     }
-    throw new NoSuchKeyException(name);
+    return null;
   }
 
   private @Nullable <T> T getNullableValue(String name, Class<T> type) {
@@ -187,12 +187,62 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
 
   @Override
   public @NonNull Iterator<Map.Entry<String, Object>> getEntryIterator() {
-    return getLocalMap().entrySet().iterator();
+    if (mKeys == null) {
+      mKeys = Assertions.assertNotNull(importKeys());
+    }
+    final String[] iteratorKeys = mKeys;
+    final Object[] iteratorValues = Assertions.assertNotNull(importValues());
+    return new Iterator<Map.Entry<String, Object>>() {
+      int currentIndex = 0;
+
+      @Override
+      public boolean hasNext() {
+        return currentIndex < iteratorKeys.length;
+      }
+
+      @Override
+      public Map.Entry<String, Object> next() {
+        final int index = currentIndex++;
+        return new Map.Entry<String, Object>() {
+          @Override
+          public String getKey() {
+            return iteratorKeys[index];
+          }
+
+          @Override
+          public Object getValue() {
+            return iteratorValues[index];
+          }
+
+          @Override
+          public Object setValue(Object value) {
+            throw new UnsupportedOperationException(
+                "Can't set a value while iterating over a ReadableNativeMap");
+          }
+        };
+      }
+    };
   }
 
   @Override
   public @NonNull ReadableMapKeySetIterator keySetIterator() {
-    return new ReadableNativeMapKeySetIterator(this);
+    if (mKeys == null) {
+      mKeys = Assertions.assertNotNull(importKeys());
+    }
+    final String[] iteratorKeys = mKeys;
+    return new ReadableMapKeySetIterator() {
+      int currentIndex = 0;
+
+      @Override
+      public boolean hasNextKey() {
+        return currentIndex < iteratorKeys.length;
+      }
+
+      @Override
+      public String nextKey() {
+        return iteratorKeys[currentIndex++];
+      }
+    };
   }
 
   @Override

package/ReactAndroid/src/main/java/com/facebook/react/bridge/RuntimeScheduler.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.bridge;
+
+import com.facebook.jni.HybridData;
+import com.facebook.proguard.annotations.DoNotStrip;
+
+/** A Java holder for a C++ RuntimeScheduler. */
+public class RuntimeScheduler {
+
+  @DoNotStrip private HybridData mHybridData;
+
+  public RuntimeScheduler(HybridData hybridData) {
+    mHybridData = hybridData;
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.java

@@ -20,31 +20,32 @@ public class SoftAssertions {
   /**
    * Throw {@link AssertionException} with a given message. Use this method surrounded with {@code
    * if} block with assert condition in case you plan to do string concatenation to produce the
-   * message. This logs an assertion with ReactSoftException, which decides whether or not to
+   * message. This logs an assertion with ReactSoftExceptionLogger, which decides whether or not to
    * actually throw.
    */
   public static void assertUnreachable(String message) {
-    ReactSoftException.logSoftException("SoftAssertions", new AssertionException(message));
+    ReactSoftExceptionLogger.logSoftException("SoftAssertions", new AssertionException(message));
   }
 
   /**
    * Asserts the given condition, throwing an {@link AssertionException} if the condition doesn't
-   * hold. This logs an assertion with ReactSoftException, which decides whether or not to actually
-   * throw.
+   * hold. This logs an assertion with ReactSoftExceptionLogger, which decides whether or not to
+   * actually throw.
    */
   public static void assertCondition(boolean condition, String message) {
     if (!condition) {
-      ReactSoftException.logSoftException("SoftAssertions", new AssertionException(message));
+      ReactSoftExceptionLogger.logSoftException("SoftAssertions", new AssertionException(message));
     }
   }
 
   /**
    * Asserts that the given Object isn't null, throwing an {@link AssertionException} if it was.
-   * This logs an assertion with ReactSoftException, which decides whether or not to actually throw.
+   * This logs an assertion with ReactSoftExceptionLogger, which decides whether or not to actually
+   * throw.
    */
   public static <T> T assertNotNull(@Nullable T instance) {
     if (instance == null) {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           "SoftAssertions", new AssertionException("Expected object to not be null!"));
     }
     return instance;

package/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java

@@ -14,12 +14,14 @@ import androidx.annotation.AnyThread;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 import com.facebook.infer.annotation.ThreadConfined;
+import java.util.List;
 
 public interface UIManager extends JSIModule, PerformanceCounter {
 
-  /** Registers a new root view. */
+  /** Registers a new root view. @Deprecated call startSurface instead */
   @UiThread
   @ThreadConfined(UI)
+  @Deprecated
   <T extends View> int addRootView(
       final T rootView, WritableMap initialProps, @Nullable String initialUITemplate);
 
@@ -41,11 +43,12 @@ public interface UIManager extends JSIModule, PerformanceCounter {
 
   /**
    * Updates the layout specs of the RootShadowNode based on the Measure specs received by
-   * parameters.
+   * parameters. offsetX and offsetY are the position of the RootView within the screen.
    */
   @UiThread
   @ThreadConfined(UI)
-  void updateRootLayoutSpecs(int rootTag, int widthMeasureSpec, int heightMeasureSpec);
+  void updateRootLayoutSpecs(
+      int rootTag, int widthMeasureSpec, int heightMeasureSpec, int offsetX, int offsetY);
 
   /**
    * Dispatches the commandId received by parameter to the view associated with the reactTag. The
@@ -82,7 +85,7 @@ public interface UIManager extends JSIModule, PerformanceCounter {
    * layout-related propertied won't be handled properly. Make sure you know what you're doing
    * before calling this method :)
    *
-   * @param tag {@link int} that identifies the view that will be updated
+   * @param reactTag {@link int} that identifies the view that will be updated
    * @param props {@link ReadableMap} props that should be immediately updated in view
    */
   @UiThread
@@ -114,6 +117,16 @@ public interface UIManager extends JSIModule, PerformanceCounter {
    */
   void removeUIManagerEventListener(UIManagerListener listener);
 
+  /**
+   * Resolves a view based on its reactTag. Do not mutate properties on this view that are already
+   * managed by React, as there are no guarantees this changes will be preserved.
+   *
+   * @throws IllegalViewOperationException if tag could not be resolved.
+   * @param reactTag tag
+   * @return view if found
+   */
+  View resolveView(int reactTag);
+
   /**
    * This method dispatches events from RN Android code to JS. The delivery of this event will not
    * be queued in EventDispatcher class.
@@ -122,5 +135,33 @@ public interface UIManager extends JSIModule, PerformanceCounter {
    * @param eventName name of the event
    * @param event parameters
    */
+  @Deprecated
   void receiveEvent(int reactTag, String eventName, @Nullable WritableMap event);
+
+  /**
+   * This method dispatches events from RN Android code to JS. The delivery of this event will not
+   * be queued in EventDispatcher class.
+   *
+   * @param surfaceId
+   * @param reactTag tag
+   * @param eventName name of the event
+   * @param event parameters
+   */
+  void receiveEvent(int surfaceId, int reactTag, String eventName, @Nullable WritableMap event);
+
+  /** Resolves Direct Event name exposed to JS from the one known to the Native side. */
+  @Deprecated
+  @Nullable
+  String resolveCustomDirectEventName(@Nullable String eventName);
+
+  /**
+   * Helper method to pre-initialize view managers. When using Native ViewConfigs this method will
+   * also pre-compute the constants for a view manager. The purpose is to ensure that we don't block
+   * for getting the constants for view managers during initial rendering of a surface.
+   *
+   * @deprecated this method will be removed in the future
+   * @param viewManagerNames {@link List <String>} names of ViewManagers
+   */
+  @Deprecated
+  void preInitializeViewManagers(List<String> viewManagerNames);
 }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java

@@ -7,7 +7,6 @@
 
 package com.facebook.react.bridge.queue;
 
-import android.os.Build;
 import androidx.annotation.Nullable;
 import com.facebook.infer.annotation.Assertions;
 
@@ -19,8 +18,6 @@ import com.facebook.infer.annotation.Assertions;
  */
 public class ReactQueueConfigurationSpec {
 
-  private static final long LEGACY_STACK_SIZE_BYTES = 2000000;
-
   private final MessageQueueThreadSpec mNativeModulesQueueThreadSpec;
   private final MessageQueueThreadSpec mJSQueueThreadSpec;
 
@@ -44,11 +41,7 @@ public class ReactQueueConfigurationSpec {
   }
 
   public static ReactQueueConfigurationSpec createDefault() {
-    MessageQueueThreadSpec spec =
-        Build.VERSION.SDK_INT < 21
-            ? MessageQueueThreadSpec.newBackgroundThreadSpec(
-                "native_modules", LEGACY_STACK_SIZE_BYTES)
-            : MessageQueueThreadSpec.newBackgroundThreadSpec("native_modules");
+    MessageQueueThreadSpec spec = MessageQueueThreadSpec.newBackgroundThreadSpec("native_modules");
     return builder()
         .setJSQueueThreadSpec(MessageQueueThreadSpec.newBackgroundThreadSpec("js"))
         .setNativeModulesQueueThreadSpec(spec)

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

@@ -1,7 +1,8 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_build_config", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "HERMES_BYTECODE_VERSION", "react_native_dep", "rn_android_build_config", "rn_android_library")
 
 SUB_PROJECTS = [
     "network/**/*",
+    "mapbuffer/**/*",
 ]
 
 rn_android_library(
@@ -10,6 +11,7 @@ rn_android_library(
         ["**/*.java"],
         exclude = SUB_PROJECTS,
     ),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -39,6 +41,7 @@ rn_android_build_config(
     package = "com.facebook.react",
     values = [
         "boolean IS_INTERNAL_BUILD = true",
+        "int HERMES_BYTECODE_VERSION = {}".format(HERMES_BYTECODE_VERSION),
     ],
     visibility = [
         "PUBLIC",

package/ReactAndroid/src/main/java/com/facebook/react/common/DebugServerException.java

@@ -21,7 +21,7 @@ import org.json.JSONObject;
 public class DebugServerException extends RuntimeException {
   private static final String GENERIC_ERROR_MESSAGE =
       "\n\nTry the following to fix the issue:\n"
-          + "\u2022 Ensure that the packager server is running\n"
+          + "\u2022 Ensure that Metro is running\n"
           + "\u2022 Ensure that your device/emulator is connected to your machine and has USB debugging enabled - run 'adb devices' to see a list of connected devices\n"
           + "\u2022 Ensure Airplane Mode is disabled\n"
           + "\u2022 If you're on a physical device connected to the same machine, run 'adb reverse tcp:<PORT> tcp:<PORT>' to forward requests from your device\n"