From 4d74b4ae619e92f539aa5a8cd28f9841e8cfa783 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Tue, 13 Sep 2022 09:48:57 -0700
Subject: [PATCH] Remove ReactFeatureFlags.enableSpannableCache

Summary:
This diff removes the feature flag ReactFeatureFlags.enableSpannableCache and it's already disabled MC

changelog: [internal] internal

Reviewed By: javache

Differential Revision: D39449840

fbshipit-source-id: 69a514b611c1179f2160a1bfd4c4199538738448
---
 .../react/config/ReactFeatureFlags.java       |  3 ---
 .../react/views/text/TextLayoutManager.java   | 27 ++-----------------
 .../text/TextLayoutManagerMapBuffer.java      | 27 ++-----------------
 3 files changed, 4 insertions(+), 53 deletions(-)

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 d8b040ec747..0ffff5edabe 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
@@ -103,9 +103,6 @@ public class ReactFeatureFlags {
    */
   public static boolean enableLargeTextMeasureCache = true;
 
-  /** TODO: T113245006 Delete this flag. Enables caching of spannables for text */
-  public static boolean enableSpannableCache = false;
-
   public static boolean dispatchPointerEvents = false;
 
   /** Feature Flag to enable the pending event queue in fabric before mounting views */
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
index c8bdae6949d..964152d93df 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
@@ -31,7 +31,6 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.common.build.ReactBuildConfig;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactStylesDiffMap;
 import com.facebook.react.uimanager.ViewProps;
@@ -193,30 +192,8 @@ public class TextLayoutManager {
       ReadableMap attributedString,
       @Nullable ReactTextViewManagerCallback reactTextViewManagerCallback) {
 
-    Spannable preparedSpannableText;
-
-    if (ReactFeatureFlags.enableSpannableCache) {
-      synchronized (sSpannableCacheLock) {
-        preparedSpannableText = sSpannableCache.get((ReadableNativeMap) attributedString);
-        if (preparedSpannableText != null) {
-          return preparedSpannableText;
-        }
-      }
-
-      preparedSpannableText =
-          createSpannableFromAttributedString(
-              context, attributedString, reactTextViewManagerCallback);
-
-      synchronized (sSpannableCacheLock) {
-        sSpannableCache.put((ReadableNativeMap) attributedString, preparedSpannableText);
-      }
-    } else {
-      preparedSpannableText =
-          createSpannableFromAttributedString(
-              context, attributedString, reactTextViewManagerCallback);
-    }
-
-    return preparedSpannableText;
+    return createSpannableFromAttributedString(
+        context, attributedString, reactTextViewManagerCallback);
   }
 
   private static Spannable createSpannableFromAttributedString(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
index d86cf9a095a..e2a8c05f2f0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
@@ -29,7 +29,6 @@ import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.common.mapbuffer.MapBuffer;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.yoga.YogaConstants;
 import com.facebook.yoga.YogaMeasureMode;
@@ -209,30 +208,8 @@ public class TextLayoutManagerMapBuffer {
       MapBuffer attributedString,
       @Nullable ReactTextViewManagerCallback reactTextViewManagerCallback) {
 
-    Spannable preparedSpannableText;
-
-    if (ReactFeatureFlags.enableSpannableCache) {
-      synchronized (sSpannableCacheLock) {
-        preparedSpannableText = sSpannableCache.get(attributedString);
-        if (preparedSpannableText != null) {
-          return preparedSpannableText;
-        }
-      }
-
-      preparedSpannableText =
-          createSpannableFromAttributedString(
-              context, attributedString, reactTextViewManagerCallback);
-
-      synchronized (sSpannableCacheLock) {
-        sSpannableCache.put(attributedString, preparedSpannableText);
-      }
-    } else {
-      preparedSpannableText =
-          createSpannableFromAttributedString(
-              context, attributedString, reactTextViewManagerCallback);
-    }
-
-    return preparedSpannableText;
+    return createSpannableFromAttributedString(
+        context, attributedString, reactTextViewManagerCallback);
   }
 
   private static Spannable createSpannableFromAttributedString(