react-native 0.0.0-16bb2ae4f → 0.0.0-18697adec

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java

@@ -30,9 +30,10 @@ import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactNoCrashSoftException;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.annotations.VisibleForTesting;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
 import com.facebook.react.touch.OnInterceptTouchEventListener;
 import com.facebook.react.touch.ReactHitSlopView;
@@ -43,6 +44,7 @@ import com.facebook.react.uimanager.PointerEvents;
 import com.facebook.react.uimanager.ReactClippingProhibitedView;
 import com.facebook.react.uimanager.ReactClippingViewGroup;
 import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
+import com.facebook.react.uimanager.ReactOverflowView;
 import com.facebook.react.uimanager.ReactPointerEventsView;
 import com.facebook.react.uimanager.ReactZIndexedViewGroup;
 import com.facebook.react.uimanager.RootView;
@@ -63,7 +65,8 @@ public class ReactViewGroup extends ViewGroup
         ReactClippingViewGroup,
         ReactPointerEventsView,
         ReactHitSlopView,
-        ReactZIndexedViewGroup {
+        ReactZIndexedViewGroup,
+        ReactOverflowView {
 
   private static final int ARRAY_CAPACITY_INCREMENT = 12;
   private static final int DEFAULT_BACKGROUND_COLOR = Color.TRANSPARENT;
@@ -574,7 +577,7 @@ public class ReactViewGroup extends ViewGroup
             @Override
             public void run() {
               if (!child.isShown()) {
-                ReactSoftException.logSoftException(
+                ReactSoftExceptionLogger.logSoftException(
                     TAG,
                     new ReactNoCrashSoftException(
                         "Child view has been added to Parent view in which it is clipped and not visible."
@@ -718,6 +721,7 @@ public class ReactViewGroup extends ViewGroup
     invalidate();
   }
 
+  @Override
   public @Nullable String getOverflow() {
     return mOverflow;
   }
@@ -756,6 +760,23 @@ public class ReactViewGroup extends ViewGroup
     }
   }
 
+  @Override
+  protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
+    boolean drawWithZ =
+        child.getElevation() > 0 && ReactFeatureFlags.insertZReorderBarriersOnViewGroupChildren;
+
+    if (drawWithZ) {
+      CanvasUtil.enableZ(canvas, false);
+    }
+
+    boolean result = super.drawChild(canvas, child, drawingTime);
+
+    if (drawWithZ) {
+      CanvasUtil.enableZ(canvas, true);
+    }
+    return result;
+  }
+
   private void dispatchOverflowDraw(Canvas canvas) {
     if (mOverflow != null) {
       switch (mOverflow) {

package/ReactAndroid/src/main/jni/react/jni/Android.mk

@@ -27,7 +27,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -Wno-unused-lambda-capture
 LOCAL_LDLIBS += -landroid
 
 # The dynamic libraries (.so files) that this module depends on.
-LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libglog_init libyoga
+LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libglog_init libyoga libreact_render_runtimescheduler
 
 # The static libraries (.a files) that this module depends on.
 LOCAL_STATIC_LIBRARIES := libreactnative libcallinvokerholder libruntimeexecutor
@@ -39,7 +39,7 @@ LOCAL_STATIC_LIBRARIES := libreactnative libcallinvokerholder libruntimeexecutor
 LOCAL_MODULE := reactnativeutilsjni
 
 # Compile all local c++ files.
-LOCAL_SRC_FILES := $(wildcard Cxx*.cpp) $(wildcard J*.cpp) $(wildcard M*.cpp) $(wildcard N*.cpp) $(wildcard P*.cpp) $(wildcard R*.cpp) $(wildcard W*.cpp)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
 ifeq ($(APP_OPTIM),debug)
   # Keep symbols by overriding the strip command invoked by ndk-build.
@@ -77,7 +77,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -Wno-unused-lambda-capture
 LOCAL_LDLIBS += -landroid
 
 # The dynamic libraries (.so files) that this module depends on.
-LOCAL_SHARED_LIBRARIES := libreactnativeutilsjni libfolly_json libfb libfbjni libglog_init libyoga
+LOCAL_SHARED_LIBRARIES := libreactnativeutilsjni libfolly_json libfb libfbjni libglog_init libyoga logger libreact_render_runtimescheduler
 
 # The static libraries (.a files) that this module depends on.
 LOCAL_STATIC_LIBRARIES := libreactnative libruntimeexecutor libcallinvokerholder
@@ -124,10 +124,12 @@ $(call import-module,yogajni)
 $(call import-module,cxxreact)
 $(call import-module,jsi)
 $(call import-module,jsiexecutor)
+$(call import-module,logger)
 $(call import-module,callinvoker)
 $(call import-module,reactperflogger)
 $(call import-module,hermes)
 $(call import-module,runtimeexecutor)
+$(call import-module,react/renderer/runtimescheduler)
 $(call import-module,react/nativemodule/core)
 
 include $(REACT_SRC_DIR)/reactperflogger/jni/Android.mk

package/ReactAndroid/src/main/jni/react/jni/BUCK

@@ -20,6 +20,7 @@ EXPORTED_HEADERS = [
     "ReadableNativeArray.h",
     "ReadableNativeMap.h",
     "JRuntimeExecutor.h",
+    "JRuntimeScheduler.h",
     "WritableNativeArray.h",
     "WritableNativeMap.h",
 ]
@@ -54,7 +55,7 @@ rn_xplat_cxx_library(
     visibility = [
         "PUBLIC",
     ],
-    deps = ([
+    deps = [
         "//xplat/third-party/linker_lib:android",
         "//xplat/third-party/linker_lib:atomic",
         "//third-party/glog:glog",
@@ -67,7 +68,9 @@ rn_xplat_cxx_library(
         react_native_xplat_target("cxxreact:module"),
         react_native_xplat_target("jsinspector:jsinspector"),
         react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
+        react_native_xplat_target("react/renderer/runtimescheduler:runtimescheduler"),
+        react_native_xplat_target("logger:logger"),
         react_native_xplat_dep("jsi:jsi"),
         FBJNI_TARGET,
-    ]) if not IS_OSS_BUILD else [],
+    ] if not IS_OSS_BUILD else [],
 )

package/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp

@@ -26,9 +26,16 @@
 #include <fb/log.h>
 #include <fbjni/ByteBuffer.h>
 #include <folly/dynamic.h>
+#include <glog/logging.h>
+#include <react/renderer/runtimescheduler/RuntimeScheduler.h>
+#include <react/renderer/runtimescheduler/RuntimeSchedulerBinding.h>
+
+#include <logger/react_native_log.h>
 
 #include "CxxModuleWrapper.h"
 #include "JNativeRunnable.h"
+#include "JReactCxxErrorHandler.h"
+#include "JReactSoftExceptionLogger.h"
 #include "JavaScriptExecutorHolder.h"
 #include "JniJSModulesUnbundle.h"
 #include "NativeArray.h"
@@ -92,6 +99,10 @@ CatalystInstanceImpl::initHybrid(jni::alias_ref<jclass>) {
 CatalystInstanceImpl::CatalystInstanceImpl()
     : instance_(std::make_unique<Instance>()) {}
 
+void CatalystInstanceImpl::warnOnLegacyNativeModuleSystemUse() {
+  CxxNativeModule::setShouldWarnOnUse(true);
+}
+
 void CatalystInstanceImpl::registerNatives() {
   registerHybrid({
       makeNativeMethod("initHybrid", CatalystInstanceImpl::initHybrid),
@@ -127,11 +138,39 @@ void CatalystInstanceImpl::registerNatives() {
           CatalystInstanceImpl::handleMemoryPressure),
       makeNativeMethod(
           "getRuntimeExecutor", CatalystInstanceImpl::getRuntimeExecutor),
+      makeNativeMethod(
+          "getRuntimeScheduler", CatalystInstanceImpl::getRuntimeScheduler),
+      makeNativeMethod(
+          "installRuntimeScheduler",
+          CatalystInstanceImpl::installRuntimeScheduler),
+      makeNativeMethod(
+          "warnOnLegacyNativeModuleSystemUse",
+          CatalystInstanceImpl::warnOnLegacyNativeModuleSystemUse),
   });
 
   JNativeRunnable::registerNatives();
 }
 
+void log(ReactNativeLogLevel level, const char *message) {
+  switch (level) {
+    case ReactNativeLogLevelInfo:
+      LOG(INFO) << message;
+      break;
+    case ReactNativeLogLevelWarning:
+      LOG(WARNING) << message;
+      JReactSoftExceptionLogger::logNoThrowSoftExceptionWithMessage(
+          "react_native_log#warning", message);
+      break;
+    case ReactNativeLogLevelError:
+      LOG(ERROR) << message;
+      JReactCxxErrorHandler::handleError(message);
+      break;
+    case ReactNativeLogLevelFatal:
+      LOG(FATAL) << message;
+      break;
+  }
+}
+
 void CatalystInstanceImpl::initializeBridge(
     jni::alias_ref<ReactCallback::javaobject> callback,
     // This executor is actually a factory holder.
@@ -142,6 +181,8 @@ void CatalystInstanceImpl::initializeBridge(
         javaModules,
     jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject>
         cxxModules) {
+  set_react_native_logfunc(&log);
+
   // TODO mhorowitz: how to assert here?
   // Assertions.assertCondition(mBridge == null, "initializeBridge should be
   // called once");
@@ -354,5 +395,25 @@ CatalystInstanceImpl::getRuntimeExecutor() {
   return runtimeExecutor_;
 }
 
+jni::alias_ref<JRuntimeScheduler::javaobject>
+CatalystInstanceImpl::getRuntimeScheduler() {
+  return runtimeScheduler_;
+}
+
+void CatalystInstanceImpl::installRuntimeScheduler() {
+  if (!runtimeScheduler_) {
+    auto runtimeExecutor = instance_->getRuntimeExecutor();
+    auto runtimeScheduler = std::make_shared<RuntimeScheduler>(runtimeExecutor);
+
+    runtimeScheduler_ =
+        jni::make_global(JRuntimeScheduler::newObjectCxxArgs(runtimeScheduler));
+
+    runtimeExecutor([runtimeScheduler](jsi::Runtime &runtime) {
+      RuntimeSchedulerBinding::createAndInstallIfNeeded(
+          runtime, runtimeScheduler);
+    });
+  }
+}
+
 } // namespace react
 } // namespace facebook

package/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h

@@ -15,6 +15,7 @@
 #include "CxxModuleWrapper.h"
 #include "JMessageQueueThread.h"
 #include "JRuntimeExecutor.h"
+#include "JRuntimeScheduler.h"
 #include "JSLoader.h"
 #include "JavaModuleWrapper.h"
 #include "ModuleRegistryBuilder.h"
@@ -61,6 +62,10 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
       jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject>
           cxxModules);
 
+  // When called from CatalystInstanceImpl.java, warnings will be logged when
+  // CxxNativeModules are used. Java NativeModule usages log error in Java.
+  void warnOnLegacyNativeModuleSystemUse();
+
   void extendNativeModules(
       jni::alias_ref<jni::JCollection<
           JavaModuleWrapper::javaobject>::javaobject> javaModules,
@@ -94,6 +99,8 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
   jni::alias_ref<CallInvokerHolder::javaobject> getJSCallInvokerHolder();
   jni::alias_ref<CallInvokerHolder::javaobject> getNativeCallInvokerHolder();
   jni::alias_ref<JRuntimeExecutor::javaobject> getRuntimeExecutor();
+  jni::alias_ref<JRuntimeScheduler::javaobject> getRuntimeScheduler();
+  void installRuntimeScheduler();
   void setGlobalVariable(std::string propName, std::string &&jsonValue);
   jlong getJavaScriptContext();
   void handleMemoryPressure(int pressureLevel);
@@ -106,6 +113,7 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
   jni::global_ref<CallInvokerHolder::javaobject> jsCallInvokerHolder_;
   jni::global_ref<CallInvokerHolder::javaobject> nativeCallInvokerHolder_;
   jni::global_ref<JRuntimeExecutor::javaobject> runtimeExecutor_;
+  jni::global_ref<JRuntimeScheduler::javaobject> runtimeScheduler_;
 };
 
 } // namespace react

package/ReactAndroid/src/main/jni/react/jni/JReactCxxErrorHandler.cpp

@@ -0,0 +1,18 @@
+/*
+ * 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.
+ */
+
+#include "JReactCxxErrorHandler.h"
+
+using namespace facebook::react;
+
+void JReactCxxErrorHandler::handleError(std::string message) {
+  static const auto handleError =
+      javaClassStatic()->getStaticMethod<void(std::string message)>(
+          "handleError");
+
+  return handleError(javaClassStatic(), message);
+}

package/ReactAndroid/src/main/jni/react/jni/JReactCxxErrorHandler.h

@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <string>
+
+namespace facebook {
+namespace react {
+
+class JReactCxxErrorHandler : public jni::JavaClass<JReactCxxErrorHandler> {
+ public:
+  static constexpr const char *kJavaDescriptor =
+      "Lcom/facebook/react/bridge/ReactCxxErrorHandler;";
+
+  static void handleError(std::string message);
+};
+
+} // namespace react
+} // namespace facebook

package/ReactAndroid/src/main/jni/react/jni/JReactSoftExceptionLogger.cpp

@@ -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.
+ */
+
+#include "JReactSoftExceptionLogger.h"
+
+using namespace facebook::react;
+
+void JReactSoftExceptionLogger::logNoThrowSoftExceptionWithMessage(
+    std::string tag,
+    std::string message) {
+  static const auto logNoThrowSoftExceptionWithMessage =
+      javaClassStatic()
+          ->getStaticMethod<void(std::string tag, std::string message)>(
+              "logNoThrowSoftExceptionWithMessage");
+
+  return logNoThrowSoftExceptionWithMessage(javaClassStatic(), tag, message);
+}

package/ReactAndroid/src/main/jni/react/jni/JReactSoftExceptionLogger.h

@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <string>
+
+namespace facebook {
+namespace react {
+
+class JReactSoftExceptionLogger
+    : public jni::JavaClass<JReactSoftExceptionLogger> {
+ public:
+  static constexpr const char *kJavaDescriptor =
+      "Lcom/facebook/react/bridge/ReactSoftExceptionLogger;";
+
+  static void logNoThrowSoftExceptionWithMessage(
+      std::string tag,
+      std::string message);
+};
+
+} // namespace react
+} // namespace facebook

package/{ReactCommon/react/renderer/core/Constants.cpp → ReactAndroid/src/main/jni/react/jni/JRuntimeScheduler.cpp}

@@ -5,19 +5,17 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "Constants.h"
+#include "JRuntimeScheduler.h"
 
 namespace facebook {
 namespace react {
 
-static bool isPropsForwardingEnabled = false;
+JRuntimeScheduler::JRuntimeScheduler(
+    std::weak_ptr<RuntimeScheduler> runtimeScheduler)
+    : runtimeScheduler_(runtimeScheduler) {}
 
-void Constants::setPropsForwardingEnabled(bool propsForwardingEnabled) {
-  isPropsForwardingEnabled = propsForwardingEnabled;
-}
-
-bool Constants::getPropsForwardingEnabled() {
-  return isPropsForwardingEnabled;
+std::weak_ptr<RuntimeScheduler> JRuntimeScheduler::get() {
+  return runtimeScheduler_;
 }
 
 } // namespace react

package/ReactAndroid/src/main/jni/react/jni/JRuntimeScheduler.h

@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <react/renderer/runtimescheduler/RuntimeScheduler.h>
+
+namespace facebook {
+namespace react {
+
+class JRuntimeScheduler : public jni::HybridClass<JRuntimeScheduler> {
+ public:
+  static auto constexpr kJavaDescriptor =
+      "Lcom/facebook/react/bridge/RuntimeScheduler;";
+
+  std::weak_ptr<RuntimeScheduler> get();
+
+ private:
+  friend HybridBase;
+  JRuntimeScheduler(std::weak_ptr<RuntimeScheduler> runtimeScheduler);
+  std::weak_ptr<RuntimeScheduler> runtimeScheduler_;
+};
+
+} // namespace react
+} // namespace facebook

package/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp

@@ -66,7 +66,7 @@ loadScriptFromAssets(AAssetManager *manager, const std::string &assetName) {
 
   throw std::runtime_error(folly::to<std::string>(
       "Unable to load script. Make sure you're "
-      "either running Metro (run 'react-native start') or that your bundle '",
+      "either running Metro (run 'npx react-native start') or that your bundle '",
       assetName,
       "' is packaged correctly for release."));
 }

package/ReactAndroid/src/main/jni/third-party/libevent/Android.mk

@@ -12,7 +12,6 @@ LOCAL_SRC_FILES := event.c \
 	bufferevent_ratelim.c \
 	bufferevent_sock.c \
 	epoll.c \
-	event.c \
 	evmap.c \
 	evthread.c \
 	evthread_pthread.c \

package/ReactAndroid/src/main/third-party/android/androidx/BUCK

@@ -32,6 +32,15 @@ fb_native.android_library(
     ],
 )
 
+fb_native.android_library(
+    name = "autofill",
+    visibility = ["PUBLIC"],
+    exported_deps = [
+        ":autofill-binary",
+        ":core",
+    ],
+)
+
 fb_native.android_library(
     name = "collection",
     visibility = ["PUBLIC"],
@@ -290,6 +299,25 @@ fb_native.android_library(
     ],
 )
 
+fb_native.android_library(
+    name = "test-runner",
+    visibility = ["PUBLIC"],
+    exported_deps = [
+        ":annotation",
+        ":test-monitor",
+        ":test-runner-binary",
+    ],
+)
+
+fb_native.android_library(
+    name = "test-rules",
+    visibility = ["PUBLIC"],
+    exported_deps = [
+        ":test-rules-binary",
+        ":test-runner",
+    ],
+)
+
 fb_native.android_library(
     name = "vectordrawable",
     visibility = ["PUBLIC"],
@@ -342,6 +370,11 @@ fb_native.android_prebuilt_aar(
     aar = ":asynclayoutinflater-binary-aar",
 )
 
+fb_native.android_prebuilt_aar(
+    name = "autofill-binary",
+    aar = ":autofill-binary-aar",
+)
+
 fb_native.prebuilt_jar(
     name = "collection-binary",
     binary_jar = ":collection-binary.jar",
@@ -462,6 +495,16 @@ fb_native.android_prebuilt_aar(
     aar = ":test-monitor-binary-aar",
 )
 
+fb_native.android_prebuilt_aar(
+    name = "test-rules-binary",
+    aar = ":test-rules-binary-aar",
+)
+
+fb_native.android_prebuilt_aar(
+    name = "test-runner-binary",
+    aar = ":test-runner-binary-aar",
+)
+
 fb_native.android_prebuilt_aar(
     name = "vectordrawable-binary",
     aar = ":vectordrawable-binary-aar",
@@ -501,6 +544,12 @@ fb_native.remote_file(
     url = "mvn:androidx.asynclayoutinflater:asynclayoutinflater:aar:1.0.0",
 )
 
+fb_native.remote_file(
+    name = "autofill-binary-aar",
+    sha1 = "d9cdaa22b9c373ba75a35dcc33ee8871543164e5",
+    url = "mvn:androidx.autofill:autofill:aar:1.1.0",
+)
+
 fb_native.remote_file(
     name = "collection-binary.jar",
     sha1 = "42858b26cafdaa69b6149f45dfc2894007bc2c7a",
@@ -641,8 +690,20 @@ fb_native.remote_file(
 
 fb_native.remote_file(
     name = "test-monitor-binary-aar",
-    sha1 = "d2f75d117c055f35c8ebbd4f96fabc2137df9e4d",
-    url = "mvn:androidx.test:monitor:aar:1.2.0",
+    sha1 = "4f3c15d0a1e0c943b233b0dc5d8f1e690cfe7c0a",
+    url = "mvn:androidx.test:monitor:aar:1.4.0",
+)
+
+fb_native.remote_file(
+    name = "test-rules-binary-aar",
+    sha1 = "0984e8b5505f08489993c783702236af7a4a18c8",
+    url = "mvn:androidx.test:rules:aar:1.4.0",
+)
+
+fb_native.remote_file(
+    name = "test-runner-binary-aar",
+    sha1 = "44d79420baf7ac208e33b35df8756f0e912ced38",
+    url = "mvn:androidx.test:runner:aar:1.4.0",
 )
 
 fb_native.remote_file(

package/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK

@@ -1,36 +1,5 @@
 load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
 
-fb_native.android_library(
-    name = "runner",
-    exported_deps = [
-        ":monitor-binary",
-        ":runner-binary",
-    ],
-    visibility = ["PUBLIC"],
-)
-
-fb_native.android_prebuilt_aar(
-    name = "monitor-binary",
-    aar = ":monitor-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "runner-binary",
-    aar = ":runner-binary-aar",
-)
-
-fb_native.remote_file(
-    name = "monitor-binary-aar",
-    sha1 = "443c2f33d4e19f868cd4e4437909ec8dcf43f053",
-    url = "mvn:androidx.test:monitor:aar:1.1.1",
-)
-
-fb_native.remote_file(
-    name = "runner-binary-aar",
-    sha1 = "810a7aacb5106d92cdf648b2497694c4ebf73500",
-    url = "mvn:androidx.test:runner:aar:1.1.1",
-)
-
 fb_native.android_prebuilt_aar(
     name = "exposed-instrumentation-api",
     aar = ":testing-support-instrumentation",

package/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java

@@ -52,6 +52,7 @@ public class ReactTestHelper {
     when(reactInstance.getReactQueueConfiguration()).thenReturn(ReactQueueConfiguration);
     when(reactInstance.getNativeModule(UIManagerModule.class))
         .thenReturn(mock(UIManagerModule.class));
+    when(reactInstance.isDestroyed()).thenReturn(false);
 
     return reactInstance;
   }

package/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK

@@ -32,6 +32,7 @@ rn_robolectric_test(
         react_native_target("java/com/facebook/react/modules/common:common"),
         react_native_target("java/com/facebook/react/modules/core:core"),
         react_native_target("java/com/facebook/react/modules/debug:debug"),
+        react_native_target("java/com/facebook/react/modules/deviceinfo:deviceinfo"),
         react_native_target("java/com/facebook/react/modules/dialog:dialog"),
         react_native_target("java/com/facebook/react/modules/network:network"),
         react_native_target("java/com/facebook/react/modules/share:share"),