Back out "Try reduce flackiness of VeniceTest"

Summary:
Original commit changeset: 5af216e6bfa3

Changelog: [Internal]

Reviewed By: yungsters, mdvacca

Differential Revision: D26894424

fbshipit-source-id: 32cc4af2283ef9e80eaf57552c3dcfb3c1fa3c67

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

@@ -163,7 +163,7 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
     ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
 
     if (reactApplicationContext != null) {
-      reactApplicationContext.addLifecycleEventListenerAndCheckState(this);
+      reactApplicationContext.addLifecycleEventListener(this);
     }
   }
 

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

@@ -23,7 +23,6 @@ import com.facebook.react.bridge.queue.MessageQueueThread;
 import com.facebook.react.bridge.queue.ReactQueueConfiguration;
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.common.ReactConstants;
-import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.react.config.ReactFeatureFlags;
 import java.lang.ref.WeakReference;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -183,14 +182,9 @@ public class ReactContext extends ContextWrapper {
     return mLifecycleState;
   }
 
-  @VisibleForTesting
   public void addLifecycleEventListener(final LifecycleEventListener listener) {
     mLifecycleEventListeners.add(listener);
-  }
-
-  public void addLifecycleEventListenerAndCheckState(final LifecycleEventListener listener) {
-    mLifecycleEventListeners.add(listener);
-    if (hasActiveCatalystInstance()) {
+    if (hasActiveCatalystInstance() || isBridgeless()) {
       switch (mLifecycleState) {
         case BEFORE_CREATE:
         case BEFORE_RESUME:

ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

@@ -176,7 +176,7 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
     mEventDispatcher = eventDispatcher;
     mShouldDeallocateEventDispatcher = false;
     mEventBeatManager = eventBeatManager;
-    mReactApplicationContext.addLifecycleEventListenerAndCheckState(this);
+    mReactApplicationContext.addLifecycleEventListener(this);
   }
 
   public FabricUIManager(
@@ -189,7 +189,7 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
     mEventDispatcher = new EventDispatcherImpl(reactContext);
     mShouldDeallocateEventDispatcher = true;
     mEventBeatManager = eventBeatManager;
-    mReactApplicationContext.addLifecycleEventListenerAndCheckState(this);
+    mReactApplicationContext.addLifecycleEventListener(this);
   }
 
   // TODO (T47819352): Rename this to startSurface for consistency with xplat/iOS

ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java

@@ -157,7 +157,7 @@ public class AccessibilityInfoModule extends NativeAccessibilityInfoSpec
 
   @Override
   public void initialize() {
-    getReactApplicationContext().addLifecycleEventListenerAndCheckState(this);
+    getReactApplicationContext().addLifecycleEventListener(this);
     updateAndSendTouchExplorationChangeEvent(mAccessibilityManager.isTouchExplorationEnabled());
     updateAndSendReduceMotionChangeEvent();
   }

ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.java

@@ -68,7 +68,7 @@ public final class TimingModule extends NativeTimingSpec
 
   @Override
   public void initialize() {
-    getReactApplicationContext().addLifecycleEventListenerAndCheckState(this);
+    getReactApplicationContext().addLifecycleEventListener(this);
     HeadlessJsTaskContext headlessJsTaskContext =
         HeadlessJsTaskContext.getInstance(getReactApplicationContext());
     headlessJsTaskContext.addTaskEventListener(this);

ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java

@@ -37,7 +37,7 @@ public class DeviceInfoModule extends NativeDeviceInfoSpec implements LifecycleE
     DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(reactContext);
     mFontScale = reactContext.getResources().getConfiguration().fontScale;
     mReactApplicationContext = reactContext;
-    mReactApplicationContext.addLifecycleEventListenerAndCheckState(this);
+    mReactApplicationContext.addLifecycleEventListener(this);
   }
 
   public DeviceInfoModule(Context context) {

ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java

@@ -156,7 +156,7 @@ public class DialogModule extends NativeDialogManagerAndroidSpec implements Life
 
   @Override
   public void initialize() {
-    getReactApplicationContext().addLifecycleEventListenerAndCheckState(this);
+    getReactApplicationContext().addLifecycleEventListener(this);
   }
 
   @Override

ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java

@@ -105,7 +105,7 @@ public class FrescoModule extends ReactContextBaseJavaModule
   @Override
   public void initialize() {
     super.initialize();
-    getReactApplicationContext().addLifecycleEventListenerAndCheckState(this);
+    getReactApplicationContext().addLifecycleEventListener(this);
     if (!hasBeenInitialized()) {
       if (mConfig == null) {
         mConfig = getDefaultConfig(getReactApplicationContext());

ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java

@@ -56,8 +56,8 @@ public class ThemedReactContext extends ReactContext {
   }
 
   @Override
-  public void addLifecycleEventListenerAndCheckState(LifecycleEventListener listener) {
-    mReactApplicationContext.addLifecycleEventListenerAndCheckState(listener);
+  public void addLifecycleEventListener(LifecycleEventListener listener) {
+    mReactApplicationContext.addLifecycleEventListener(listener);
   }
 
   @Override

ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java

@@ -158,7 +158,7 @@ public class UIManagerModule extends ReactContextBaseJavaModule
             mEventDispatcher,
             minTimeLeftInFrameForNonBatchedOperationMs);
 
-    reactContext.addLifecycleEventListenerAndCheckState(this);
+    reactContext.addLifecycleEventListener(this);
   }
 
   @Deprecated
@@ -180,7 +180,7 @@ public class UIManagerModule extends ReactContextBaseJavaModule
             mEventDispatcher,
             minTimeLeftInFrameForNonBatchedOperationMs);
 
-    reactContext.addLifecycleEventListenerAndCheckState(this);
+    reactContext.addLifecycleEventListener(this);
   }
 
   /**

ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherImpl.java

@@ -104,7 +104,7 @@ public class EventDispatcherImpl implements EventDispatcher, LifecycleEventListe
 
   public EventDispatcherImpl(ReactApplicationContext reactContext) {
     mReactContext = reactContext;
-    mReactContext.addLifecycleEventListenerAndCheckState(this);
+    mReactContext.addLifecycleEventListener(this);
     mReactEventEmitter = new ReactEventEmitter(mReactContext);
   }