Revert D58459930: Add ReactMarkerConstants.CONTENT_APPEARED support o…

…n Android Differential Revision: D58459930 Original commit changeset: 4498a3623c50 Original Phabricator Diff: D58459930 fbshipit-source-id: 8bc5ef3c8b1e42a4085ee6d2834bf6906c936c0d
facebook · Jun 13, 2024 · 7e0f894 · 7e0f894
1 parent 3cb03cb
commit 7e0f894
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
@@ -434,8 +434,10 @@ public void run() {
 
     if (mShouldLogContentAppeared) {
       mShouldLogContentAppeared = false;
-      String jsModuleName = getJSModuleName();
-      ReactMarker.logMarker(ReactMarkerConstants.CONTENT_APPEARED, jsModuleName, mRootViewTag);
+
+      if (mJSModuleName != null) {
+        ReactMarker.logMarker(ReactMarkerConstants.CONTENT_APPEARED, mJSModuleName, mRootViewTag);
+      }
     }
   }
 

diff --git a/...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java b/...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java
@@ -375,9 +375,7 @@ public DevSupportManager getDevSupportManager() {
   public ReactSurface createSurface(
       Context context, String moduleName, @Nullable Bundle initialProps) {
     ReactSurfaceImpl surface = new ReactSurfaceImpl(context, moduleName, initialProps);
-    ReactSurfaceView surfaceView = new ReactSurfaceView(context, surface);
-    surfaceView.setShouldLogContentAppeared(true);
-    surface.attachView(surfaceView);
+    surface.attachView(new ReactSurfaceView(context, surface));
     surface.attach(this);
     return surface;
   }

diff --git a/...es/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceView.kt b/...es/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceView.kt
@@ -134,8 +134,6 @@ public class ReactSurfaceView(context: Context?, private val surface: ReactSurfa
   // This surface view is always on Fabric.
   @UIManagerType override fun getUIManagerType(): Int = UIManagerType.FABRIC
 
-  override fun getJSModuleName(): String = surface.moduleName
-
   override fun dispatchJSTouchEvent(event: MotionEvent) {
     val eventDispatcher = surface.eventDispatcher
     if (eventDispatcher != null) {