From 11b7443afba5bf9ebafa2174858a5edb299d76a5 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Thu, 27 Jan 2022 17:02:08 -0800
Subject: [PATCH] Delete ReactFeatureFlags.enableReactContextCleanupFix

Summary:
This diff deletes the flag ReactFeatureFlags.enableReactContextCleanupFix, the flag was disabled for many months, I just disable it.

changelog: [internal] internal

Reviewed By: genkikondo, makovkastar

Differential Revision: D33781628

fbshipit-source-id: 4b5e22adf9d30da5b85bbbde8bdc98d98f5e8891
---
 .../java/com/facebook/react/bridge/JSIModuleRegistry.java   | 4 ----
 .../com/facebook/react/bridge/NativeModuleRegistry.java     | 3 ---
 .../main/java/com/facebook/react/bridge/ReactContext.java   | 6 ------
 .../java/com/facebook/react/config/ReactFeatureFlags.java   | 3 ---
 .../java/com/facebook/react/uimanager/UIManagerModule.java  | 3 ---
 5 files changed, 19 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java
index 3ce8da92284..3853232e6db 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java
@@ -8,7 +8,6 @@
 package com.facebook.react.bridge;
 
 import com.facebook.infer.annotation.Assertions;
-import com.facebook.react.config.ReactFeatureFlags;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -45,8 +44,5 @@ public class JSIModuleRegistry {
       JSIModuleHolder moduleHolder = entry.getValue();
       moduleHolder.notifyJSInstanceDestroy();
     }
-    if (ReactFeatureFlags.enableReactContextCleanupFix) {
-      mModules.clear();
-    }
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java
index 9c57bcbfddd..254e8d56117 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java
@@ -107,9 +107,6 @@ public class NativeModuleRegistry {
       for (ModuleHolder module : mModules.values()) {
         module.destroy();
       }
-      if (ReactFeatureFlags.enableReactContextCleanupFix) {
-        mModules.clear();
-      }
     } finally {
       Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
     }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
index 4399def792f..e45f93b4ba1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
+++ b/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.config.ReactFeatureFlags;
 import java.lang.ref.WeakReference;
 import java.util.concurrent.CopyOnWriteArraySet;
 
@@ -320,11 +319,6 @@ public class ReactContext extends ContextWrapper {
     if (mCatalystInstance != null) {
       mCatalystInstance.destroy();
     }
-    if (ReactFeatureFlags.enableReactContextCleanupFix) {
-      mLifecycleEventListeners.clear();
-      mActivityEventListeners.clear();
-      mWindowFocusEventListeners.clear();
-    }
   }
 
   /** Should be called by the hosting Fragment in {@link Fragment#onActivityResult} */
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 50c3f686ec2..f0fd2127770 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
@@ -71,9 +71,6 @@ public class ReactFeatureFlags {
 
   public static boolean enableRuntimeSchedulerInTurboModule = false;
 
-  /** Enables a more aggressive cleanup during destruction of ReactContext */
-  public static boolean enableReactContextCleanupFix = false;
-
   /** Feature flag to configure eager attachment of the root view/initialisation of the JS code */
   public static boolean enableEagerRootViewAttachment = false;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
index 7f4981d9658..bcf11bf677c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
@@ -234,9 +234,6 @@ public class UIManagerModule extends ReactContextBaseJavaModule
     mUIImplementation.onCatalystInstanceDestroyed();
 
     ReactApplicationContext reactApplicationContext = getReactApplicationContext();
-    if (ReactFeatureFlags.enableReactContextCleanupFix) {
-      reactApplicationContext.removeLifecycleEventListener(this);
-    }
     reactApplicationContext.unregisterComponentCallbacks(mMemoryTrimCallback);
     YogaNodePool.get().clear();
     ViewManagerPropertyUpdater.clear();