From 85f1e984bb8d6decee4a771dc79055a52a5ec52b Mon Sep 17 00:00:00 2001 From: Joshua Gross Date: Tue, 30 Jun 2020 16:09:03 -0700 Subject: [PATCH] Remove references to enableFabricStopAllSurfacesOnTeardown Summary: According to our experiments it's not better than "stop surface on unmount" in any way, and might regress some metrics. Unclear why, but if it's not necessary and doesn't seem to help, it doesn't make sense to continue this experiment. We still have a mechanism on the C++ side to stop outstanding surfaces on teardown that does the same thing. Changelog: [Internal] Reviewed By: mdvacca Differential Revision: D22318864 fbshipit-source-id: 7e678c63e4884382e57d996a7f4c4b7b24c8193a --- .../com/facebook/react/config/ReactFeatureFlags.java | 3 --- .../java/com/facebook/react/fabric/FabricUIManager.java | 9 --------- 2 files changed, 12 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 ce0b3d4dba8..e0882c0cbc8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java +++ b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java @@ -81,9 +81,6 @@ public class ReactFeatureFlags { /** Feature flag to configure initialization of Fabric surfaces. */ public static boolean enableFabricStartSurfaceWithLayoutMetrics = true; - /** Feature flag to have FabricUIManager teardown stop all active surfaces. */ - public static boolean enableFabricStopAllSurfacesOnTeardown = false; - /** Feature flag to use stopSurface when ReactRootView is unmounted. */ public static boolean enableStopSurfaceOnRootViewUnmount = false; } diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java index e76a5746e08..1edbe4229cb 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java @@ -297,15 +297,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener { // memory immediately. mDispatchUIFrameCallback.stop(); - // Stop all attached surfaces - if (ReactFeatureFlags.enableFabricStopAllSurfacesOnTeardown) { - FLog.e(TAG, "stop all attached surfaces"); - for (int surfaceId : mReactContextForRootTag.keySet()) { - FLog.e(TAG, "stop attached surface: " + surfaceId); - stopSurface(surfaceId); - } - } - mBinding.unregister(); mBinding = null;