Clean up stale QE rn_arch_android:use_optimized_event_batching_android (#54417)

Summary:
Pull Request resolved: #54417

Remove feature rn_arch_android:use_optimized_event_batching_android flag.

Changelog: [internal]

Reviewed By: javache

Differential Revision: D86131089

fbshipit-source-id: 8ac81bc97a97071fc9fbf1f32ebda081d76db575

Author: sbuggay

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<66a87f8b82a1b3497eb9181a4ac6bab7>>
+ * @generated SignedSource<<9646ebeba75ec903be5ade7e2333f0c8>>
  */
 
 /**
@@ -468,12 +468,6 @@ public object ReactNativeFeatureFlags {
   @JvmStatic
   public fun useNativeViewConfigsInBridgelessMode(): Boolean = accessor.useNativeViewConfigsInBridgelessMode()
 
-  /**
-   * Uses an optimized mechanism for event batching on Android that does not need to wait for a Choreographer frame callback.
-   */
-  @JvmStatic
-  public fun useOptimizedEventBatchingOnAndroid(): Boolean = accessor.useOptimizedEventBatchingOnAndroid()
-
   /**
    * Instead of using folly::dynamic as internal representation in RawProps and RawValue, use jsi::Value
    */

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<5112bb2a180751673d4197088af9fdd1>>
+ * @generated SignedSource<<9d6ccbe6d02608901fc18ad88baab176>>
  */
 
 /**
@@ -93,7 +93,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
   private var useNativeEqualsInNativeReadableArrayAndroidCache: Boolean? = null
   private var useNativeTransformHelperAndroidCache: Boolean? = null
   private var useNativeViewConfigsInBridgelessModeCache: Boolean? = null
-  private var useOptimizedEventBatchingOnAndroidCache: Boolean? = null
   private var useRawPropsJsiValueCache: Boolean? = null
   private var useShadowNodeStateOnCloneCache: Boolean? = null
   private var useSharedAnimatedBackendCache: Boolean? = null
@@ -761,15 +760,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
     return cached
   }
 
-  override fun useOptimizedEventBatchingOnAndroid(): Boolean {
-    var cached = useOptimizedEventBatchingOnAndroidCache
-    if (cached == null) {
-      cached = ReactNativeFeatureFlagsCxxInterop.useOptimizedEventBatchingOnAndroid()
-      useOptimizedEventBatchingOnAndroidCache = cached
-    }
-    return cached
-  }
-
   override fun useRawPropsJsiValue(): Boolean {
     var cached = useRawPropsJsiValueCache
     if (cached == null) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<d98233be82b913d6327c29a897d09eb7>>
+ * @generated SignedSource<<fbc551ca005a7d8abcd2cf2e5d29a3a6>>
  */
 
 /**
@@ -174,8 +174,6 @@ public object ReactNativeFeatureFlagsCxxInterop {
 
   @DoNotStrip @JvmStatic public external fun useNativeViewConfigsInBridgelessMode(): Boolean
 
-  @DoNotStrip @JvmStatic public external fun useOptimizedEventBatchingOnAndroid(): Boolean
-
   @DoNotStrip @JvmStatic public external fun useRawPropsJsiValue(): Boolean
 
   @DoNotStrip @JvmStatic public external fun useShadowNodeStateOnClone(): Boolean

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<32ad8dfa8f1c1d662ff0ea7b424eb070>>
+ * @generated SignedSource<<7b8a5ad9a3353ea32a39bd139e9174f7>>
  */
 
 /**
@@ -169,8 +169,6 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
 
   override fun useNativeViewConfigsInBridgelessMode(): Boolean = false
 
-  override fun useOptimizedEventBatchingOnAndroid(): Boolean = false
-
   override fun useRawPropsJsiValue(): Boolean = true
 
   override fun useShadowNodeStateOnClone(): Boolean = false

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<b10ff10cb0d389a563da50c75a49c746>>
+ * @generated SignedSource<<9bb9a7cf89c92f5a397b2328fa983dc6>>
  */
 
 /**
@@ -97,7 +97,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
   private var useNativeEqualsInNativeReadableArrayAndroidCache: Boolean? = null
   private var useNativeTransformHelperAndroidCache: Boolean? = null
   private var useNativeViewConfigsInBridgelessModeCache: Boolean? = null
-  private var useOptimizedEventBatchingOnAndroidCache: Boolean? = null
   private var useRawPropsJsiValueCache: Boolean? = null
   private var useShadowNodeStateOnCloneCache: Boolean? = null
   private var useSharedAnimatedBackendCache: Boolean? = null
@@ -838,16 +837,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
     return cached
   }
 
-  override fun useOptimizedEventBatchingOnAndroid(): Boolean {
-    var cached = useOptimizedEventBatchingOnAndroidCache
-    if (cached == null) {
-      cached = currentProvider.useOptimizedEventBatchingOnAndroid()
-      accessedFeatureFlags.add("useOptimizedEventBatchingOnAndroid")
-      useOptimizedEventBatchingOnAndroidCache = cached
-    }
-    return cached
-  }
-
   override fun useRawPropsJsiValue(): Boolean {
     var cached = useRawPropsJsiValueCache
     if (cached == null) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<c4917c92012d904810ef7d832adf124c>>
+ * @generated SignedSource<<eeb5d70e45eecdef0d9307cbe8ff17c2>>
  */
 
 /**
@@ -169,8 +169,6 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun useNativeViewConfigsInBridgelessMode(): Boolean
 
-  @DoNotStrip public fun useOptimizedEventBatchingOnAndroid(): Boolean
-
   @DoNotStrip public fun useRawPropsJsiValue(): Boolean
 
   @DoNotStrip public fun useShadowNodeStateOnClone(): Boolean

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/FabricEventDispatcher.kt

@@ -7,14 +7,12 @@
 
 package com.facebook.react.uimanager.events
 
-import android.os.Handler
 import android.view.Choreographer
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactSoftExceptionLogger
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.modules.core.ReactChoreographer
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.common.UIManagerType
@@ -41,19 +39,6 @@ internal class FabricEventDispatcher(
   private val postEventDispatchListeners = CopyOnWriteArrayList<BatchEventDispatchedListener>()
   private val currentFrameCallback = ScheduleDispatchFrameCallback()
 
-  private var isDispatchScheduled = false
-  private val dispatchEventsRunnable = Runnable {
-    isDispatchScheduled = false
-    Systrace.beginSection(Systrace.TRACE_TAG_REACT, "BatchEventDispatchedListeners")
-    try {
-      for (listener in postEventDispatchListeners) {
-        listener.onBatchEventDispatched()
-      }
-    } finally {
-      Systrace.endSection(Systrace.TRACE_TAG_REACT)
-    }
-  }
-
   init {
     reactContext.addLifecycleEventListener(this)
     eventEmitter.registerFabricEventEmitter(fabricEventEmitter)
@@ -109,14 +94,7 @@ internal class FabricEventDispatcher(
   }
 
   private fun scheduleDispatchOfBatchedEvents() {
-    if (ReactNativeFeatureFlags.useOptimizedEventBatchingOnAndroid()) {
-      if (!isDispatchScheduled) {
-        isDispatchScheduled = true
-        uiThreadHandler.postAtFrontOfQueue(dispatchEventsRunnable)
-      }
-    } else {
-      currentFrameCallback.maybeScheduleDispatchOfBatchedEvents()
-    }
+    currentFrameCallback.maybeScheduleDispatchOfBatchedEvents()
   }
 
   /** Add a listener to this EventDispatcher. */
@@ -139,9 +117,7 @@ internal class FabricEventDispatcher(
 
   override fun onHostResume() {
     scheduleDispatchOfBatchedEvents()
-    if (!ReactNativeFeatureFlags.useOptimizedEventBatchingOnAndroid()) {
-      currentFrameCallback.resume()
-    }
+    currentFrameCallback.resume()
   }
 
   override fun onHostPause() {
@@ -165,12 +141,7 @@ internal class FabricEventDispatcher(
 
   private fun cancelDispatchOfBatchedEvents() {
     UiThreadUtil.assertOnUiThread()
-    if (ReactNativeFeatureFlags.useOptimizedEventBatchingOnAndroid()) {
-      isDispatchScheduled = false
-      uiThreadHandler.removeCallbacks(dispatchEventsRunnable)
-    } else {
-      currentFrameCallback.stop()
-    }
+    currentFrameCallback.stop()
   }
 
   private inner class ScheduleDispatchFrameCallback : Choreographer.FrameCallback {
@@ -229,8 +200,4 @@ internal class FabricEventDispatcher(
       }
     }
   }
-
-  private companion object {
-    private val uiThreadHandler: Handler = UiThreadUtil.getUiThreadHandler()
-  }
 }

packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<ddcb4ebb0a1e5e80364d081650286b96>>
+ * @generated SignedSource<<0527dbb4a838be34b80d76b11d18cea0>>
  */
 
 /**
@@ -477,12 +477,6 @@ class ReactNativeFeatureFlagsJavaProvider
     return method(javaProvider_);
   }
 
-  bool useOptimizedEventBatchingOnAndroid() override {
-    static const auto method =
-        getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("useOptimizedEventBatchingOnAndroid");
-    return method(javaProvider_);
-  }
-
   bool useRawPropsJsiValue() override {
     static const auto method =
         getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("useRawPropsJsiValue");
@@ -906,11 +900,6 @@ bool JReactNativeFeatureFlagsCxxInterop::useNativeViewConfigsInBridgelessMode(
   return ReactNativeFeatureFlags::useNativeViewConfigsInBridgelessMode();
 }
 
-bool JReactNativeFeatureFlagsCxxInterop::useOptimizedEventBatchingOnAndroid(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
-  return ReactNativeFeatureFlags::useOptimizedEventBatchingOnAndroid();
-}
-
 bool JReactNativeFeatureFlagsCxxInterop::useRawPropsJsiValue(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
   return ReactNativeFeatureFlags::useRawPropsJsiValue();
@@ -1206,9 +1195,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
       makeNativeMethod(
         "useNativeViewConfigsInBridgelessMode",
         JReactNativeFeatureFlagsCxxInterop::useNativeViewConfigsInBridgelessMode),
-      makeNativeMethod(
-        "useOptimizedEventBatchingOnAndroid",
-        JReactNativeFeatureFlagsCxxInterop::useOptimizedEventBatchingOnAndroid),
       makeNativeMethod(
         "useRawPropsJsiValue",
         JReactNativeFeatureFlagsCxxInterop::useRawPropsJsiValue),

packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<1e735f99b2d275f5065fb7959e45adc5>>
+ * @generated SignedSource<<a1deb0145d8c51d608903e1704e96b8d>>
  */
 
 /**
@@ -249,9 +249,6 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool useNativeViewConfigsInBridgelessMode(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool useOptimizedEventBatchingOnAndroid(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
   static bool useRawPropsJsiValue(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 

packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<5a7c80b50fda63afb95e8c6f4651eebc>>
+ * @generated SignedSource<<a2224b72c2e27abf6a158aa1b4fe9ed0>>
  */
 
 /**
@@ -318,10 +318,6 @@ bool ReactNativeFeatureFlags::useNativeViewConfigsInBridgelessMode() {
   return getAccessor().useNativeViewConfigsInBridgelessMode();
 }
 
-bool ReactNativeFeatureFlags::useOptimizedEventBatchingOnAndroid() {
-  return getAccessor().useOptimizedEventBatchingOnAndroid();
-}
-
 bool ReactNativeFeatureFlags::useRawPropsJsiValue() {
   return getAccessor().useRawPropsJsiValue();
 }