From 08a5cb2ddb554510a1b9851a7f350a06cf484eee Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Thu, 21 Aug 2025 02:34:25 -0700 Subject: [PATCH 1/2] Deprecate `BridgelessReactContext.getCatalystInstance()` Summary: This method is deprecated and should not be invoked in NewArch, therefore I'm deprecating it now. Changelog: [Android] [Deprecated] - Deprecate `BridgelessReactContext.getCatalystInstance()` method Reviewed By: cipolleschi Differential Revision: D80626638 --- .../java/com/facebook/react/runtime/BridgelessReactContext.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.kt index 045d0e7a05a9..6e6921ee9501 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.kt @@ -64,6 +64,9 @@ internal class BridgelessReactContext(context: Context, private val reactHost: R override fun getFabricUIManager(): UIManager? = reactHost.uiManager @OptIn(FrameworkAPI::class) + @Deprecated( + "This method is deprecated in the New Architecture. You should not be invoking directly as we're going to remove it in the future." + ) override fun getCatalystInstance(): CatalystInstance { if (ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) { throw UnsupportedOperationException( From 4c379cb8e452319f65effc52598dc118d4016cbc Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Thu, 21 Aug 2025 02:34:25 -0700 Subject: [PATCH 2/2] Delete internal `ReactPackageLogger` as no longer necessary Summary: This interface was internal and legacy arch only, so it can safely be removed. I've also removed the logic inside `ReactInstanceManager` that was using it as no longer necessary. Changelog: [Internal] [Changed] - Reviewed By: mdvacca Differential Revision: D80626639 --- .../com/facebook/react/CoreModulesPackage.kt | 10 +--------- .../facebook/react/ReactInstanceManager.java | 7 ------- .../com/facebook/react/ReactPackageLogger.kt | 20 ------------------- 3 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactPackageLogger.kt diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.kt index 9693326d7101..345367997515 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.kt @@ -66,7 +66,7 @@ internal class CoreModulesPackage( private val hardwareBackBtnHandler: DefaultHardwareBackBtnHandler, private val lazyViewManagersEnabled: Boolean, private val minTimeLeftInFrameForNonBatchedOperationMs: Int, -) : BaseReactPackage(), ReactPackageLogger { +) : BaseReactPackage() { /** * This method is overridden, since OSS does not run the annotation processor to generate * [CoreModulesPackage.ReactModuleInfoProvider] class. Here we check if it exists with the method @@ -196,14 +196,6 @@ internal class CoreModulesPackage( } } - override fun startProcessPackage() { - ReactMarker.logMarker(ReactMarkerConstants.PROCESS_CORE_REACT_PACKAGE_START) - } - - override fun endProcessPackage() { - ReactMarker.logMarker(ReactMarkerConstants.PROCESS_CORE_REACT_PACKAGE_END) - } - private companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index 18c93e63d86c..04affe8015d5 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -1570,14 +1570,7 @@ private void processPackage( SystraceMessage.beginSection(TRACE_TAG_REACT, "processPackage") .arg("className", reactPackage.getClass().getSimpleName()) .flush(); - if (reactPackage instanceof ReactPackageLogger) { - ((ReactPackageLogger) reactPackage).startProcessPackage(); - } nativeModuleRegistryBuilder.processPackage(reactPackage); - - if (reactPackage instanceof ReactPackageLogger) { - ((ReactPackageLogger) reactPackage).endProcessPackage(); - } SystraceMessage.endSection(TRACE_TAG_REACT).flush(); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactPackageLogger.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactPackageLogger.kt deleted file mode 100644 index 2ceffbf13661..000000000000 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactPackageLogger.kt +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -package com.facebook.react - -import com.facebook.react.common.annotations.internal.LegacyArchitecture -import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel - -/** Interface for the bridge to call for TTI start and end markers. */ -@Deprecated("This class is deprecated and will be removed in the next major release.") -@LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) -internal interface ReactPackageLogger { - fun startProcessPackage() - - fun endProcessPackage() -}