From b5a40fb4f482a22f2dc749e6253520d3a1d4301c Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@meta.com>
Date: Mon, 17 Oct 2022 05:57:32 -0700
Subject: [PATCH] Remove flag enable_blocking_queues_for_animated

Summary:
changelog: [internal]

jest_e2e[run_all_tests]

Reviewed By: mdvacca

Differential Revision: D40340959

fbshipit-source-id: dc1250de7cd6107eab18b3705ec2d5b5a46fa9ad
---
 .../react/animated/NativeAnimatedModule.java  | 26 ++-----------------
 .../react/config/ReactFeatureFlags.java       |  3 ---
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
index bcbb2b082bd..0f52b73c616 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
@@ -25,7 +25,6 @@ import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.UIManagerListener;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.annotations.VisibleForTesting;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.ReactChoreographer;
@@ -154,38 +153,21 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
   private class ConcurrentOperationQueue {
     private final Queue<UIThreadOperation> mQueue = new ConcurrentLinkedQueue<>();
     @Nullable private UIThreadOperation mPeekedOperation = null;
-    private boolean mSynchronizedAccess = false;
 
     @AnyThread
     boolean isEmpty() {
       return mQueue.isEmpty() && mPeekedOperation == null;
     }
 
-    void setSynchronizedAccess(boolean isSynchronizedAccess) {
-      mSynchronizedAccess = isSynchronizedAccess;
-    }
-
     @AnyThread
     void add(UIThreadOperation operation) {
-      if (mSynchronizedAccess) {
-        synchronized (this) {
-          mQueue.add(operation);
-        }
-      } else {
-        mQueue.add(operation);
-      }
+      mQueue.add(operation);
     }
 
     @UiThread
     void executeBatch(long maxBatchNumber, NativeAnimatedNodesManager nodesManager) {
       List<UIThreadOperation> operations;
-      if (mSynchronizedAccess) {
-        synchronized (this) {
-          operations = drainQueueIntoList(maxBatchNumber);
-        }
-      } else {
-        operations = drainQueueIntoList(maxBatchNumber);
-      }
+      operations = drainQueueIntoList(maxBatchNumber);
       if (operations != null) {
         for (UIThreadOperation operation : operations) {
           operation.execute(nodesManager);
@@ -280,10 +262,6 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
             }
           }
         };
-
-    // If shipping this flag, make sure to migrate to non-concurrent queue for efficiency
-    mOperations.setSynchronizedAccess(ReactFeatureFlags.enableSynchronizationForAnimated);
-    mPreOperations.setSynchronizedAccess(ReactFeatureFlags.enableSynchronizationForAnimated);
   }
 
   @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
index 5ae2595e628..d70075f2a3d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
@@ -73,9 +73,6 @@ public class ReactFeatureFlags {
   /** Feature flag to configure eager attachment of the root view/initialisation of the JS code */
   public static boolean enableEagerRootViewAttachment = false;
 
-  /** Feature flag to configure synchronized queue access for Animated module */
-  public static boolean enableSynchronizationForAnimated = false;
-
   /** Enables or disables MapBuffer Serialization */
   public static boolean mapBufferSerializationEnabled = false;