react-native 0.71.4 → 0.72.0-rc.0

package/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java

@@ -26,7 +26,6 @@ import com.facebook.react.bridge.UIManagerListener;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.ReactChoreographer;
 import com.facebook.react.uimanager.GuardedFrameCallback;
 import com.facebook.react.uimanager.NativeViewHierarchyManager;
@@ -85,11 +84,10 @@ import java.util.concurrent.atomic.AtomicReference;
  * This isolates us from the problems that may be caused by concurrent updates of animated graph
  * while UI thread is "executing" the animation loop.
  */
-@ReactModule(name = NativeAnimatedModule.NAME)
+@ReactModule(name = NativeAnimatedModuleSpec.NAME)
 public class NativeAnimatedModule extends NativeAnimatedModuleSpec
     implements LifecycleEventListener, UIManagerListener {
 
-  public static final String NAME = "NativeAnimatedModule";
   public static final boolean ANIMATED_MODULE_DEBUG = false;
 
   // For `queueAndExecuteBatchedOperations`
@@ -266,11 +264,9 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
 
   @Override
   public void initialize() {
-    ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
+    super.initialize();
 
-    if (reactApplicationContext != null) {
-      reactApplicationContext.addLifecycleEventListener(this);
-    }
+    getReactApplicationContext().addLifecycleEventListener(this);
   }
 
   @Override
@@ -377,11 +373,6 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
     clearFrameCallback();
   }
 
-  @Override
-  public String getName() {
-    return NAME;
-  }
-
   /**
    * Returns a {@link NativeAnimatedNodesManager}, either the existing instance or a new one. Will
    * return null if and only if the {@link ReactApplicationContext} is also null.
@@ -574,9 +565,7 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
             ReactApplicationContext reactApplicationContext =
                 getReactApplicationContextIfActiveOrWarn();
             if (reactApplicationContext != null) {
-              reactApplicationContext
-                  .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                  .emit("onAnimatedValueUpdate", onAnimatedValueData);
+              reactApplicationContext.emitDeviceEvent("onAnimatedValueUpdate", onAnimatedValueData);
             }
           }
         };
@@ -987,10 +976,9 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
 
   @Override
   public void invalidate() {
-    ReactApplicationContext context = getReactApplicationContextIfActiveOrWarn();
-    if (context != null) {
-      context.removeLifecycleEventListener(this);
-    }
+    super.invalidate();
+
+    getReactApplicationContext().removeLifecycleEventListener(this);
   }
 
   /**
@@ -1099,9 +1087,8 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
                           ReactApplicationContext reactApplicationContext =
                               getReactApplicationContextIfActiveOrWarn();
                           if (reactApplicationContext != null) {
-                            reactApplicationContext
-                                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                                .emit("onAnimatedValueUpdate", onAnimatedValueData);
+                            reactApplicationContext.emitDeviceEvent(
+                                "onAnimatedValueUpdate", onAnimatedValueData);
                           }
                         }
                       };

package/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java

@@ -23,7 +23,6 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.events.Event;
@@ -308,9 +307,8 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
           WritableMap params = Arguments.createMap();
           params.putInt("animationId", animation.mId);
           params.putBoolean("finished", false);
-          mReactApplicationContext
-              .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-              .emit("onNativeAnimatedModuleAnimationFinished", params);
+          mReactApplicationContext.emitDeviceEvent(
+              "onNativeAnimatedModuleAnimationFinished", params);
         }
         mActiveAnimations.removeAt(i);
         i--;
@@ -339,9 +337,8 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
           WritableMap params = Arguments.createMap();
           params.putInt("animationId", animation.mId);
           params.putBoolean("finished", false);
-          mReactApplicationContext
-              .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-              .emit("onNativeAnimatedModuleAnimationFinished", params);
+          mReactApplicationContext.emitDeviceEvent(
+              "onNativeAnimatedModuleAnimationFinished", params);
         }
         mActiveAnimations.removeAt(i);
         return;
@@ -474,9 +471,7 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
     WritableMap params = Arguments.createMap();
     params.putInt("tag", tag);
     params.putDouble("value", value);
-    mReactApplicationContext
-        .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-        .emit("onNativeAnimatedModuleGetValue", params);
+    mReactApplicationContext.emitDeviceEvent("onNativeAnimatedModuleGetValue", params);
   }
 
   @UiThread
@@ -653,12 +648,8 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
             WritableMap params = Arguments.createMap();
             params.putInt("animationId", animation.mId);
             params.putBoolean("finished", true);
-            DeviceEventManagerModule.RCTDeviceEventEmitter eventEmitter =
-                mReactApplicationContext.getJSModule(
-                    DeviceEventManagerModule.RCTDeviceEventEmitter.class);
-            if (eventEmitter != null) {
-              eventEmitter.emit("onNativeAnimatedModuleAnimationFinished", params);
-            }
+            mReactApplicationContext.emitDeviceEvent(
+                "onNativeAnimatedModuleAnimationFinished", params);
           }
           mActiveAnimations.removeAt(i);
         }

package/ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.java

@@ -102,7 +102,9 @@ import java.util.Map;
         ((StyleAnimatedNode) node).collectViewUpdates(mPropMap);
       } else if (node instanceof ValueAnimatedNode) {
         Object animatedObject = ((ValueAnimatedNode) node).getAnimatedObject();
-        if (animatedObject instanceof String) {
+        if (animatedObject instanceof Integer) {
+          mPropMap.putInt(entry.getKey(), (Integer) animatedObject);
+        } else if (animatedObject instanceof String) {
           mPropMap.putString(entry.getKey(), (String) animatedObject);
         } else {
           mPropMap.putDouble(entry.getKey(), ((ValueAnimatedNode) node).getValue());

package/ReactAndroid/src/main/java/com/facebook/react/animated/StyleAnimatedNode.java

@@ -42,7 +42,14 @@ import java.util.Map;
       } else if (node instanceof TransformAnimatedNode) {
         ((TransformAnimatedNode) node).collectViewUpdates(propsMap);
       } else if (node instanceof ValueAnimatedNode) {
-        propsMap.putDouble(entry.getKey(), ((ValueAnimatedNode) node).getValue());
+        Object animatedObject = ((ValueAnimatedNode) node).getAnimatedObject();
+        if (animatedObject instanceof Integer) {
+          propsMap.putInt(entry.getKey(), (Integer) animatedObject);
+        } else if (animatedObject instanceof String) {
+          propsMap.putString(entry.getKey(), (String) animatedObject);
+        } else {
+          propsMap.putDouble(entry.getKey(), ((ValueAnimatedNode) node).getValue());
+        }
       } else if (node instanceof ColorAnimatedNode) {
         propsMap.putInt(entry.getKey(), ((ColorAnimatedNode) node).getColor());
       } else {

package/ReactAndroid/src/main/java/com/facebook/react/animated/ValueAnimatedNode.java

@@ -15,7 +15,6 @@ import com.facebook.react.bridge.ReadableMap;
  * library.
  */
 /*package*/ class ValueAnimatedNode extends AnimatedNode {
-  /*package*/ Object mAnimatedObject = null;
   /*package*/ double mValue = Double.NaN;
   /*package*/ double mOffset = 0;
   private @Nullable AnimatedNodeValueListener mValueListener;
@@ -37,7 +36,7 @@ import com.facebook.react.bridge.ReadableMap;
   }
 
   public Object getAnimatedObject() {
-    return mAnimatedObject;
+    return null;
   }
 
   public void flattenOffset() {

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

@@ -1,4 +1,4 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "IS_OSS_BUILD", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "IS_OSS_BUILD", "YOGA_TARGET", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_android_library")
 
 INTERFACES = [
     "Dynamic.java",
@@ -26,13 +26,6 @@ rn_android_library(
     ],
     language = "JAVA",
     proguard_config = "reactnative.pro",
-    provided_deps = [
-        react_native_dep("third-party/android/androidx:annotation"),
-        react_native_dep("third-party/android/androidx:core"),
-        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"),
-    ],
     required_for_source_only_abi = True,
     tests = [
         react_native_tests_target("java/com/facebook/react/bridge:bridge"),
@@ -41,21 +34,26 @@ rn_android_library(
         "PUBLIC",
     ],
     deps = [
+        YOGA_TARGET,
         react_native_dep("java/com/facebook/debug/debugoverlay/model:model"),
         react_native_dep("java/com/facebook/systrace:systrace"),
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
         react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
+        react_native_dep("third-party/android/androidx:annotation"),
+        react_native_dep("third-party/android/androidx:core"),
+        react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
-        react_native_target("java/com/facebook/debug/tags:tags"),
         react_native_target("java/com/facebook/debug/holder:holder"),
+        react_native_target("java/com/facebook/debug/tags:tags"),
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/config:config"),
-        react_native_target("java/com/facebook/react/module/model:model"),
-        react_native_target("java/com/facebook/react/uimanager/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
-        react_native_target("java/com/facebook/react/turbomodule/core/interfaces:interfaces"),
+        react_native_target("java/com/facebook/react/module/model:model"),
         react_native_target("java/com/facebook/react/turbomodule/core:callinvokerholder"),
+        react_native_target("java/com/facebook/react/turbomodule/core/interfaces:interfaces"),
+        react_native_target("java/com/facebook/react/uimanager/common:common"),
     ] + ([react_native_target("jni/react/jni:jni")] if not IS_OSS_BUILD else []),
     exported_deps = [
         react_native_dep("libraries/fbjni:java"),
@@ -74,18 +72,15 @@ rn_android_library(
     ],
     language = "JAVA",
     proguard_config = "reactnative.pro",
-    provided_deps = [
-        react_native_dep("third-party/android/androidx:annotation"),
-        react_native_dep("third-party/android/androidx:core"),
-        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"),
-    ],
     required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
     ],
     deps = [
+        react_native_dep("third-party/android/androidx:annotation"),
+        react_native_dep("third-party/android/androidx:core"),
+        react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/debug/tags:tags"),

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

@@ -17,7 +17,7 @@ import java.util.List;
 
 /**
  * A higher level API on top of the asynchronous JSC bridge. This provides an environment allowing
- * the invocation of JavaScript methods and lets a set of Java APIs be invokable from JavaScript as
+ * the invocation of JavaScript methods and lets a set of Java APIs be invocable from JavaScript as
  * well.
  */
 @DoNotStrip

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

@@ -12,6 +12,8 @@ import android.content.res.Resources;
 import android.util.TypedValue;
 import androidx.annotation.Nullable;
 import androidx.core.content.res.ResourcesCompat;
+import com.facebook.common.logging.FLog;
+import com.facebook.react.common.ReactConstants;
 
 public class ColorPropConverter {
   private static final String JSON_KEY = "resource_paths";
@@ -61,6 +63,15 @@ public class ColorPropConverter {
         "ColorValue: the value must be a number or Object.");
   }
 
+  public static Integer getColor(Object value, Context context, int defaultInt) {
+    try {
+      return getColor(value, context);
+    } catch (JSApplicationCausedNativeException e) {
+      FLog.w(ReactConstants.TAG, e, "Error converting ColorValue");
+      return defaultInt;
+    }
+  }
+
   public static Integer resolveResourcePath(Context context, @Nullable String resourcePath) {
     if (resourcePath == null || resourcePath.isEmpty()) {
       return null;

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and 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 androidx.annotation.Nullable;
+import com.facebook.yoga.YogaUnit;
+import com.facebook.yoga.YogaValue;
+
+public class DimensionPropConverter {
+
+  @Nullable
+  public static YogaValue getDimension(@Nullable Object value) {
+    if (value == null) {
+      return null;
+    }
+
+    if (value instanceof Double) {
+      return new YogaValue(((Double) value).floatValue(), YogaUnit.POINT);
+    }
+
+    if (value instanceof String) {
+      return YogaValue.parse((String) value);
+    }
+
+    throw new JSApplicationCausedNativeException(
+        "DimensionValue: the value must be a number or string.");
+  }
+}

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

@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and 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 java.util.Iterator;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class JSONArguments {
+  /**
+   * Parse JSONObject to ReadableMap
+   *
+   * @param obj The JSONObject to be parsed
+   * @return readableMap from the JSONObject
+   */
+  public static ReadableMap fromJSONObject(JSONObject obj) throws JSONException {
+    WritableMap result = Arguments.createMap();
+    Iterator<String> keys = obj.keys();
+
+    while (keys.hasNext()) {
+      String key = keys.next();
+      Object val = obj.get(key);
+      if (val instanceof JSONObject) {
+        result.putMap(key, fromJSONObject((JSONObject) val));
+      } else if (val instanceof JSONArray) {
+        result.putArray(key, fromJSONArray((JSONArray) val));
+      } else if (val instanceof String) {
+        result.putString(key, (String) val);
+      } else if (val instanceof Boolean) {
+        result.putBoolean(key, (Boolean) val);
+      } else if (val instanceof Integer) {
+        result.putInt(key, (Integer) val);
+      } else if (val instanceof Double) {
+        result.putDouble(key, (Double) val);
+      } else if (val instanceof Long) {
+        result.putInt(key, ((Long) val).intValue());
+      } else if (obj.isNull(key)) {
+        result.putNull(key);
+      } else {
+        // Unknown value type. Will throw
+        throw new JSONException("Unexpected value when parsing JSON object. key: " + key);
+      }
+    }
+
+    return result;
+  }
+
+  /**
+   * Parse String of JSON object to ReadableMap
+   *
+   * @param objStr The String JSON object to be parsed
+   * @return readableMap from the JSONArray
+   */
+  public static ReadableMap fromJSONObjectString(String objStr) throws JSONException {
+    return fromJSONObject(new JSONObject(objStr));
+  }
+
+  /**
+   * Parse JSONArray to ReadableArray
+   *
+   * @param arr The JSONArray to be parsed
+   * @return readableArray from the JSONArray
+   */
+  public static ReadableArray fromJSONArray(JSONArray arr) throws JSONException {
+    WritableArray result = Arguments.createArray();
+
+    for (int i = 0; i < arr.length(); i++) {
+      Object val = arr.get(i);
+
+      if (val instanceof JSONObject) {
+        result.pushMap(fromJSONObject((JSONObject) val));
+      } else if (val instanceof JSONArray) {
+        result.pushArray(fromJSONArray((JSONArray) val));
+      } else if (val instanceof String) {
+        result.pushString((String) val);
+      } else if (val instanceof Boolean) {
+        result.pushBoolean((Boolean) val);
+      } else if (val instanceof Integer) {
+        result.pushInt((Integer) val);
+      } else if (val instanceof Double) {
+        result.pushDouble((Double) val);
+      } else if (val instanceof Long) {
+        result.pushInt(((Long) val).intValue());
+      } else if (arr.isNull(i)) {
+        result.pushNull();
+      } else {
+        // Unknown value type. Will throw
+        throw new JSONException("Unexpected value when parsing JSON array. index: " + i);
+      }
+    }
+
+    return result;
+  }
+
+  /**
+   * Parse String of JSON array to ReadableArray
+   *
+   * @param arrStr The String JSON array to be parsed
+   * @return readableArray from the JSONArray
+   */
+  public static ReadableArray fromJSONArrayString(String arrStr) throws JSONException {
+    return fromJSONArray(new JSONArray(arrStr));
+  }
+}

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

@@ -46,7 +46,7 @@ public class ModuleHolder {
   private final ReactModuleInfo mReactModuleInfo;
 
   private @Nullable Provider<? extends NativeModule> mProvider;
-  // Outside of the constructur, these should only be checked or set when synchronized on this
+  // Outside of the constructor, these should only be checked or set when synchronized on this
   private @Nullable @GuardedBy("this") NativeModule mModule;
 
   // These are used to communicate phases of creation and initialization across threads

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

@@ -7,8 +7,8 @@
 
 package com.facebook.react.bridge;
 
-import androidx.annotation.NonNull;
 import com.facebook.proguard.annotations.DoNotStrip;
+import javax.annotation.Nonnull;
 
 /**
  * A native module whose API can be provided to JS catalyst instances. {@link NativeModule}s whose
@@ -29,7 +29,7 @@ public interface NativeModule {
    * @return the name of this module. This will be the name used to {@code require()} this module
    *     from javascript.
    */
-  @NonNull
+  @Nonnull
   String getName();
 
   /**

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

@@ -15,10 +15,12 @@ import android.content.ContextWrapper;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.ThreadConfined;
+import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.queue.MessageQueueThread;
 import com.facebook.react.bridge.queue.ReactQueueConfiguration;
 import com.facebook.react.common.LifecycleState;
@@ -32,6 +34,10 @@ import java.util.concurrent.CopyOnWriteArraySet;
  * CatalystInstance}
  */
 public class ReactContext extends ContextWrapper {
+  @DoNotStrip
+  public interface RCTDeviceEventEmitter extends JavaScriptModule {
+    void emit(@NonNull String eventName, @Nullable Object data);
+  }
 
   private static final String TAG = "ReactContext";
   private static final String EARLY_JS_ACCESS_EXCEPTION_MESSAGE =
@@ -183,6 +189,21 @@ public class ReactContext extends ContextWrapper {
     return mCatalystInstance.getNativeModule(nativeModuleInterface);
   }
 
+  /**
+   * Calls RCTDeviceEventEmitter.emit to JavaScript, with given event name and an optional list of
+   * arguments.
+   */
+  public void emitDeviceEvent(String eventName, @Nullable Object args) {
+    RCTDeviceEventEmitter eventEmitter = getJSModule(RCTDeviceEventEmitter.class);
+    if (eventEmitter != null) {
+      eventEmitter.emit(eventName, args);
+    }
+  }
+
+  public void emitDeviceEvent(String eventName) {
+    emitDeviceEvent(eventName, null);
+  }
+
   public CatalystInstance getCatalystInstance() {
     return Assertions.assertNotNull(mCatalystInstance);
   }
@@ -422,7 +443,7 @@ public class ReactContext extends ContextWrapper {
           "Unable to handle Exception - catalystInstanceVariableExists: "
               + catalystInstanceVariableExists
               + " - isCatalystInstanceAlive: "
-              + !isCatalystInstanceAlive
+              + isCatalystInstanceAlive
               + " - hasExceptionHandler: "
               + hasExceptionHandler,
           e);
@@ -444,6 +465,10 @@ public class ReactContext extends ContextWrapper {
     return mExceptionHandlerWrapper;
   }
 
+  public JSExceptionHandler getJSExceptionHandler() {
+    return mJSExceptionHandler;
+  }
+
   public boolean hasCurrentActivity() {
     return mCurrentActivity != null && mCurrentActivity.get() != null;
   }
@@ -486,7 +511,10 @@ public class ReactContext extends ContextWrapper {
    * synchronized(jsContext) { nativeThingNeedingJsContext(jsContext.get()); }
    */
   public JavaScriptContextHolder getJavaScriptContextHolder() {
-    return mCatalystInstance.getJavaScriptContextHolder();
+    if (mCatalystInstance != null) {
+      return mCatalystInstance.getJavaScriptContextHolder();
+    }
+    return null;
   }
 
   public @Nullable JSIModule getJSIModule(JSIModuleType moduleType) {

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

@@ -14,6 +14,7 @@ import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.ThreadConfined;
+import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.build.ReactBuildConfig;
 
 /**
@@ -59,11 +60,10 @@ public abstract class ReactContextBaseJavaModule extends BaseJavaModule {
     // We want to collect data about how often this happens, but SoftExceptions will cause a crash
     // in debug mode, which isn't usually desirable.
     String msg = "Catalyst Instance has already disappeared: requested by " + this.getName();
-    String tag = "ReactContextBaseJavaModule";
     if (ReactBuildConfig.DEBUG) {
-      FLog.w(tag, msg);
+      FLog.w(ReactConstants.TAG, msg);
     } else {
-      ReactSoftExceptionLogger.logSoftException(tag, new RuntimeException(msg));
+      ReactSoftExceptionLogger.logSoftException(ReactConstants.TAG, new RuntimeException(msg));
     }
     return null;
   }

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

@@ -42,6 +42,9 @@ public class ReactMarker {
   private static final List<FabricMarkerListener> sFabricMarkerListeners =
       new CopyOnWriteArrayList<>();
 
+  // The android app start time that to be set by the corresponding app
+  private static long sAppStartTime;
+
   @DoNotStrip
   public static void addListener(MarkerListener listener) {
     if (!sListeners.contains(listener)) {
@@ -138,4 +141,14 @@ public class ReactMarker {
       listener.logMarker(name, tag, instanceKey);
     }
   }
+
+  @DoNotStrip
+  public static void setAppStartTime(long appStartTime) {
+    sAppStartTime = appStartTime;
+  }
+
+  @DoNotStrip
+  public static double getAppStartTime() {
+    return (double) sAppStartTime;
+  }
 }