From 363224ea626a3ddc51500a16d337da1df2d09633 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Thu, 20 Apr 2023 19:43:33 -0700 Subject: [PATCH] Deprecate EventBeatManager constructor (#36905) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/36905 In this diff I'm deprecating EventBeatManager constructor that receives a Context as a parameter. bypass-github-export-checks changelog: [Android][Deprecated] deprecating EventBeatManager constructor that receives a Context as a parameter. Reviewed By: fkgozali Differential Revision: D44759827 fbshipit-source-id: cb117c26af0a43fe245f8778a55dfbea756b3ce6 --- .../com/facebook/react/bridgeless/ReactInstance.java | 2 +- .../facebook/react/fabric/FabricJSIModuleProvider.java | 2 +- .../facebook/react/fabric/events/EventBeatManager.java | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java index 944512441fe..96813436fde 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java @@ -221,7 +221,7 @@ public final class ReactInstance { } }); - EventBeatManager eventBeatManager = new EventBeatManager(mBridgelessReactContext); + EventBeatManager eventBeatManager = new EventBeatManager(); mFabricUIManager = new FabricUIManager(mBridgelessReactContext, viewManagerRegistry, eventBeatManager); diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java index 2d162f95754..533b1368b92 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java @@ -36,7 +36,7 @@ public class FabricJSIModuleProvider implements JSIModuleProvider { @Override public UIManager get() { Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricJSIModuleProvider.get"); - final EventBeatManager eventBeatManager = new EventBeatManager(mReactApplicationContext); + final EventBeatManager eventBeatManager = new EventBeatManager(); final FabricUIManager uiManager = createUIManager(eventBeatManager); Systrace.beginSection( diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventBeatManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventBeatManager.java index f67dd871671..4c4703d0ae7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventBeatManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventBeatManager.java @@ -19,22 +19,25 @@ import com.facebook.react.uimanager.events.BatchEventDispatchedListener; * Class that acts as a proxy between the list of EventBeats registered in C++ and the Android side. */ @SuppressLint("MissingNativeLoadLibrary") -public class EventBeatManager implements BatchEventDispatchedListener { +public final class EventBeatManager implements BatchEventDispatchedListener { static { FabricSoLoader.staticInit(); } @DoNotStrip private final HybridData mHybridData; - private final ReactApplicationContext mReactApplicationContext; private static native HybridData initHybrid(); private native void tick(); + @Deprecated(forRemoval = true, since = "Deprecated on v0.72.0 Use EventBeatManager() instead") public EventBeatManager(@NonNull ReactApplicationContext reactApplicationContext) { + this(); + } + + public EventBeatManager() { mHybridData = initHybrid(); - mReactApplicationContext = reactApplicationContext; } @Override