react-native 0.0.0-17be3a003 → 0.0.0-18697adec

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

@@ -139,6 +139,11 @@ public class CatalystInstanceImpl implements CatalystInstance {
 
     FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge before initializeBridge");
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "initializeCxxBridge");
+
+    if (ReactFeatureFlags.warnOnLegacyNativeModuleSystemUse) {
+      warnOnLegacyNativeModuleSystemUse();
+    }
+
     initializeBridge(
         new BridgeCallback(this),
         jsExecutor,
@@ -206,6 +211,8 @@ public class CatalystInstanceImpl implements CatalystInstance {
   private native void jniExtendNativeModules(
       Collection<JavaModuleWrapper> javaModules, Collection<ModuleHolder> cxxModules);
 
+  private native void warnOnLegacyNativeModuleSystemUse();
+
   private native void initializeBridge(
       ReactCallback callback,
       JavaScriptExecutor jsExecutor,
@@ -549,9 +556,12 @@ public class CatalystInstanceImpl implements CatalystInstance {
     return mJavaScriptContextHolder;
   }
 
-  @Override
   public native RuntimeExecutor getRuntimeExecutor();
 
+  public native RuntimeScheduler getRuntimeScheduler();
+
+  public native void installRuntimeScheduler();
+
   @Override
   public void addJSIModules(List<JSIModuleSpec> jsiModules) {
     mJSIModuleRegistry.registerModules(jsiModules);

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

@@ -15,6 +15,7 @@ import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
 
 import androidx.annotation.Nullable;
 import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.systrace.Systrace;
 import com.facebook.systrace.SystraceMessage;
 import java.lang.reflect.Method;
@@ -43,6 +44,7 @@ public class JavaModuleWrapper {
   private final ModuleHolder mModuleHolder;
   private final ArrayList<NativeModule.NativeMethod> mMethods;
   private final ArrayList<MethodDescriptor> mDescs;
+  private static final String TAG = JavaModuleWrapper.class.getSimpleName();
 
   public JavaModuleWrapper(JSInstance jsInstance, ModuleHolder moduleHolder) {
     mJSInstance = jsInstance;
@@ -113,6 +115,17 @@ public class JavaModuleWrapper {
 
   @DoNotStrip
   public @Nullable NativeMap getConstants() {
+    if (ReactFeatureFlags.warnOnLegacyNativeModuleSystemUse) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new ReactNoCrashSoftException(
+              "Calling getConstants() on Java NativeModule (name = \""
+                  + mModuleHolder.getName()
+                  + "\", className = "
+                  + mModuleHolder.getClassName()
+                  + ")."));
+    }
+
     if (!mModuleHolder.getHasConstants()) {
       return null;
     }
@@ -144,10 +157,34 @@ public class JavaModuleWrapper {
 
   @DoNotStrip
   public void invoke(int methodId, ReadableNativeArray parameters) {
+    if (ReactFeatureFlags.warnOnLegacyNativeModuleSystemUse) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new ReactNoCrashSoftException(
+              "Calling method on Java NativeModule (name = \""
+                  + mModuleHolder.getName()
+                  + "\", className = "
+                  + mModuleHolder.getClassName()
+                  + ")."));
+    }
+
     if (mMethods == null || methodId >= mMethods.size()) {
       return;
     }
 
+    if (ReactFeatureFlags.warnOnLegacyNativeModuleSystemUse) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new ReactNoCrashSoftException(
+              "Calling "
+                  + mDescs.get(methodId).name
+                  + "() on Java NativeModule (name = \""
+                  + mModuleHolder.getName()
+                  + "\", className = "
+                  + mModuleHolder.getClassName()
+                  + ")."));
+    }
+
     mMethods.get(methodId).invoke(mJSInstance, parameters);
   }
 }

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

@@ -21,6 +21,7 @@ public class NativeModuleRegistry {
 
   private final ReactApplicationContext mReactApplicationContext;
   private final Map<String, ModuleHolder> mModules;
+  private final String TAG = NativeModuleRegistry.class.getSimpleName();
 
   public NativeModuleRegistry(
       ReactApplicationContext reactApplicationContext, Map<String, ModuleHolder> modules) {
@@ -41,6 +42,17 @@ public class NativeModuleRegistry {
     ArrayList<JavaModuleWrapper> javaModules = new ArrayList<>();
     for (Map.Entry<String, ModuleHolder> entry : mModules.entrySet()) {
       if (!entry.getValue().isCxxModule()) {
+        if (ReactFeatureFlags.warnOnLegacyNativeModuleSystemUse) {
+          ReactSoftExceptionLogger.logSoftException(
+              TAG,
+              new ReactNoCrashSoftException(
+                  "Registering legacy NativeModule: Java NativeModule (name = \""
+                      + entry.getValue().getName()
+                      + "\", className = "
+                      + entry.getValue().getClassName()
+                      + ")."));
+        }
+
         javaModules.add(new JavaModuleWrapper(jsInstance, entry.getValue()));
       }
     }
@@ -51,6 +63,16 @@ public class NativeModuleRegistry {
     ArrayList<ModuleHolder> cxxModules = new ArrayList<>();
     for (Map.Entry<String, ModuleHolder> entry : mModules.entrySet()) {
       if (entry.getValue().isCxxModule()) {
+        if (ReactFeatureFlags.warnOnLegacyNativeModuleSystemUse) {
+          ReactSoftExceptionLogger.logSoftException(
+              TAG,
+              new ReactNoCrashSoftException(
+                  "Registering legacy NativeModule: Cxx NativeModule (name = \""
+                      + entry.getValue().getName()
+                      + "\", className = "
+                      + entry.getValue().getClassName()
+                      + ")."));
+        }
         cxxModules.add(entry.getValue());
       }
     }

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() {
@@ -352,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);
   }
 

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

@@ -63,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/ReactMarkerConstants.java

@@ -119,5 +119,7 @@ public enum ReactMarkerConstants {
   REACT_BRIDGE_LOADING_START,
   REACT_BRIDGE_LOADING_END,
   REACT_BRIDGELESS_LOADING_START,
-  REACT_BRIDGELESS_LOADING_END
+  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/{ReactSoftException.java → ReactSoftExceptionLogger.java}

@@ -13,9 +13,7 @@ import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 @DoNotStrip
-@Deprecated
-// TODO T53446395: unify ReactSoftException with a more generic exception-handling utility
-public class ReactSoftException {
+public class ReactSoftExceptionLogger {
   public interface ReactSoftExceptionListener {
     void logSoftException(final String category, final Throwable cause);
   }
@@ -52,4 +50,11 @@ public class ReactSoftException {
       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/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

@@ -117,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.

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

@@ -1,4 +1,4 @@
-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/**/*",
@@ -41,7 +41,7 @@ rn_android_build_config(
     package = "com.facebook.react",
     values = [
         "boolean IS_INTERNAL_BUILD = true",
-        "int HERMES_BYTECODE_VERSION = 0",
+        "int HERMES_BYTECODE_VERSION = {}".format(HERMES_BYTECODE_VERSION),
     ],
     visibility = [
         "PUBLIC",

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

@@ -21,6 +21,9 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_target("java/com/facebook/react/common:common"),
+        # dependencies used for systraces
+        react_native_dep("java/com/facebook/systrace:systrace"),
+        react_native_target("java/com/facebook/react/bridge:bridge"),
     ],
     exported_deps = [],
 )

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.java

@@ -10,7 +10,6 @@ package com.facebook.react.common.mapbuffer;
 import androidx.annotation.Nullable;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.soloader.SoLoader;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Iterator;
@@ -23,14 +22,14 @@ import java.util.Iterator;
 public class ReadableMapBuffer implements Iterable<ReadableMapBuffer.MapBufferEntry> {
 
   static {
-    SoLoader.loadLibrary("mapbufferjni");
+    ReadableMapBufferSoLoader.staticInit();
   }
 
   // Value used to verify if the data is serialized with LittleEndian order.
   private static final int ALIGNMENT = 0xFE;
 
-  // 6 bytes = 2 (alignment) + 2 (count) + 2 (size)
-  private static final int HEADER_SIZE = 6;
+  // 8 bytes = 2 (alignment) + 2 (count) + 4 (size)
+  private static final int HEADER_SIZE = 8;
 
   // key size = 2 bytes
   private static final int KEY_SIZE = 2;
@@ -50,7 +49,7 @@ public class ReadableMapBuffer implements Iterable<ReadableMapBuffer.MapBufferEn
 
   // Size of the Serialized Data
   @SuppressWarnings("unused")
-  private short mSizeOfData = 0;
+  private int mSizeOfData = 0;
 
   // Amount of items serialized on the ByteBuffer
   @SuppressWarnings("unused")
@@ -158,10 +157,10 @@ public class ReadableMapBuffer implements Iterable<ReadableMapBuffer.MapBufferEn
   private ReadableMapBuffer readMapBufferValue(int position) {
     int offset = getOffsetForDynamicData() + mBuffer.getInt(position);
 
-    int sizeMapBuffer = mBuffer.getShort(offset);
+    int sizeMapBuffer = mBuffer.getInt(offset);
     byte[] buffer = new byte[sizeMapBuffer];
 
-    int bufferOffset = offset + SHORT_SIZE;
+    int bufferOffset = offset + INT_SIZE;
 
     mBuffer.position(bufferOffset);
     mBuffer.get(buffer, 0, sizeMapBuffer);
@@ -178,7 +177,7 @@ public class ReadableMapBuffer implements Iterable<ReadableMapBuffer.MapBufferEn
     // count
     mCount = mBuffer.getShort();
     // size
-    mSizeOfData = mBuffer.getShort();
+    mSizeOfData = mBuffer.getInt();
   }
 
   /**

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBufferSoLoader.java

@@ -0,0 +1,33 @@
+/*
+ * 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.common.mapbuffer;
+
+import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
+
+import com.facebook.react.bridge.ReactMarker;
+import com.facebook.react.bridge.ReactMarkerConstants;
+import com.facebook.soloader.SoLoader;
+import com.facebook.systrace.Systrace;
+
+public class ReadableMapBufferSoLoader {
+  private static volatile boolean sDidInit = false;
+
+  public static void staticInit() {
+    if (sDidInit) {
+      return;
+    }
+    Systrace.beginSection(
+        Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
+        "ReadableMapBufferSoLoader.staticInit::load:mapbufferjni");
+    ReactMarker.logMarker(ReactMarkerConstants.LOAD_REACT_NATIVE_MAPBUFFER_SO_FILE_START);
+    SoLoader.loadLibrary("mapbufferjni");
+    ReactMarker.logMarker(ReactMarkerConstants.LOAD_REACT_NATIVE_MAPBUFFER_SO_FILE_END);
+    Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
+    sDidInit = true;
+  }
+}

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

@@ -19,7 +19,7 @@ rn_xplat_cxx_library(
     ],
     fbandroid_allow_jni_merging = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
-    platforms = (ANDROID),
+    platforms = ANDROID,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
@@ -28,6 +28,7 @@ rn_xplat_cxx_library(
     visibility = ["PUBLIC"],
     deps = [
         react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
+        react_native_xplat_target("react/debug:debug"),
         FBJNI_TARGET,
     ],
 )

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.cpp

@@ -21,16 +21,29 @@ void ReadableMapBuffer::registerNatives() {
 
 jni::local_ref<jni::JByteBuffer>
 ReadableMapBuffer::importByteBufferAllocateDirect() {
-  // TODO: Using this method is safer than "importByteBuffer" because ByteBuffer
-  // memory will be deallocated once the "Java ByteBuffer" is deallocated. Next
-  // steps:
+  // TODO T83483191: Using this method is safer than "importByteBuffer" because
+  // ByteBuffer memory will be deallocated once the "Java ByteBuffer" is
+  // deallocated. Next steps:
   // - Validate perf of this method vs importByteBuffer
   // - Validate that there's no leaking of memory
-  return jni::JByteBuffer::allocateDirect(_serializedDataSize);
+  react_native_assert(
+      (serializedData_ != nullptr && serializedDataSize_ != 0) &&
+      "Error serializedData_ is not initialized");
+  auto ret = jni::JByteBuffer::allocateDirect(serializedDataSize_);
+  // TODO T83483191: avoid allocating serializedData_ when using
+  // JByteBuffer::allocateDirect
+  std::memcpy(
+      ret->getDirectBytes(), (void *)serializedData_, serializedDataSize_);
+
+  // Deallocate serializedData_ since it's not necessary anymore
+  delete[] serializedData_;
+  serializedData_ = nullptr;
+  serializedDataSize_ = 0;
+  return ret;
 }
 
 jni::JByteBuffer::javaobject ReadableMapBuffer::importByteBuffer() {
-  // TODO: Reevaluate what's the best approach here (allocateDirect vs
+  // TODO T83483191: Reevaluate what's the best approach here (allocateDirect vs
   // DirectByteBuffer).
   //
   // On this method we should:
@@ -44,7 +57,7 @@ jni::JByteBuffer::javaobject ReadableMapBuffer::importByteBuffer() {
   // transfer data of multitple Maps
   return static_cast<jni::JByteBuffer::javaobject>(
       jni::Environment::current()->NewDirectByteBuffer(
-          (void *)_serializedData, _serializedDataSize));
+          (void *)serializedData_, serializedDataSize_));
 }
 
 jni::local_ref<ReadableMapBuffer::jhybridobject>
@@ -53,9 +66,10 @@ ReadableMapBuffer::createWithContents(MapBuffer &&map) {
 }
 
 ReadableMapBuffer::~ReadableMapBuffer() {
-  delete[] _serializedData;
-  _serializedData = nullptr;
-  _serializedDataSize = 0;
+  if (serializedData_ != nullptr) {
+    delete[] serializedData_;
+    serializedData_ = nullptr;
+  }
 }
 
 } // namespace react

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <fbjni/fbjni.h>
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
 
 #include <fbjni/ByteBuffer.h>
@@ -31,16 +32,18 @@ class ReadableMapBuffer : public jni::HybridClass<ReadableMapBuffer> {
   ~ReadableMapBuffer();
 
  private:
-  uint8_t *_serializedData = nullptr;
+  uint8_t *serializedData_ = nullptr;
 
-  int _serializedDataSize = 0;
+  int32_t serializedDataSize_ = 0;
 
   friend HybridBase;
 
   explicit ReadableMapBuffer(MapBuffer &&map) {
-    _serializedDataSize = map.getBufferSize();
-    _serializedData = new Byte[_serializedDataSize];
-    map.copy(_serializedData);
+    serializedDataSize_ = map.getBufferSize();
+    react_native_assert(
+        (serializedDataSize_ != 0) && "Error no content in map");
+    serializedData_ = new Byte[serializedDataSize_];
+    map.copy(serializedData_);
   }
 };
 

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

@@ -1,4 +1,4 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
 
 rn_android_library(
     name = "config",
@@ -9,5 +9,6 @@ rn_android_library(
         "PUBLIC",
     ],
     deps = [
+        react_native_dep("java/com/facebook/proguard/annotations:annotations"),
     ],
 )