'[skip ci] fix: ReactDevToolsSettingsManagerModule in ReactModuleList for android

packages/debugger-frontend/BUILD_INFO

@@ -1,5 +1,5 @@
-@generated SignedSource<<85fb986aee1b601b649481b64d2b5dc8>>
-Git revision: e8c79432972029c625c91d16967b07fe61f04a61
+@generated SignedSource<<be159160e305455e8919c5e323fb1784>>
+Git revision: 87b2feb14627b3e8713bc2637992b9a8c76bbe61
 Built with --nohooks: false
 Is local checkout: false
 Remote URL: https://github.com/facebookexperimental/rn-chrome-devtools-frontend

packages/react-native/Libraries/Core/setUpReactDevTools.js

@@ -15,17 +15,22 @@ import type {Domain} from '../../src/private/fusebox/setUpFuseboxReactDevToolsDi
 if (__DEV__) {
   // Register dispatcher on global, which can be used later by Chrome DevTools frontend
   require('../../src/private/fusebox/setUpFuseboxReactDevToolsDispatcher');
+  const {
+    initialize,
+    connectToDevTools,
+    connectWithCustomMessagingProtocol,
+  } = require('react-devtools-core');
 
   // Install hook before React is loaded.
-  const reactDevTools = require('react-devtools-core');
+  initialize();
+
   // This should be defined in DEV, otherwise error is expected.
   const fuseboxReactDevToolsDispatcher =
     global.__FUSEBOX_REACT_DEVTOOLS_DISPATCHER__;
   const reactDevToolsFuseboxGlobalBindingName =
     fuseboxReactDevToolsDispatcher.BINDING_NAME;
 
   const ReactNativeStyleAttributes = require('../Components/View/ReactNativeStyleAttributes');
-  const devToolsSettingsManager = require('../DevToolsSettings/DevToolsSettingsManager');
   const resolveRNStyle = require('../StyleSheet/flattenStyle');
 
   let disconnect = null;
@@ -37,7 +42,7 @@ if (__DEV__) {
   }
 
   function connectToReactDevToolsInFusebox(domain: Domain) {
-    disconnect = reactDevTools.connectWithCustomMessagingProtocol({
+    disconnect = connectWithCustomMessagingProtocol({
       onSubscribe: listener => {
         domain.onMessage.addEventListener(listener);
       },
@@ -47,7 +52,6 @@ if (__DEV__) {
       onMessage: (event, payload) => {
         domain.sendMessage({event, payload});
       },
-      settingsManager: devToolsSettingsManager,
       nativeStyleEditorValidAttributes: Object.keys(ReactNativeStyleAttributes),
       resolveRNStyle,
     });
@@ -101,14 +105,13 @@ if (__DEV__) {
         isWebSocketOpen = true;
       });
 
-      reactDevTools.connectToDevTools({
+      connectToDevTools({
         isAppActive,
         resolveRNStyle,
         nativeStyleEditorValidAttributes: Object.keys(
           ReactNativeStyleAttributes,
         ),
         websocket: ws,
-        devToolsSettingsManager,
       });
     }
   }

packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap

@@ -4548,24 +4548,6 @@ declare export default typeof useSubscribeToDebuggingOverlayRegistry;
 "
 `;
 
-exports[`public API should not change unintentionally Libraries/DevToolsSettings/DevToolsSettingsManager.js.flow 1`] = `
-"declare const DevToolsSettingsManager: {
-  setConsolePatchSettings(newConsolePatchSettings: string): void,
-  getConsolePatchSettings(): ?string,
-  setProfilingSettings(newProfilingSettings: string): void,
-  getProfilingSettings(): ?string,
-  reload(): void,
-};
-declare module.exports: DevToolsSettingsManager;
-"
-`;
-
-exports[`public API should not change unintentionally Libraries/DevToolsSettings/NativeDevToolsSettingsManager.js 1`] = `
-"export * from \\"../../src/private/specs/modules/NativeDevToolsSettingsManager\\";
-declare export default typeof NativeDevToolsSettingsManager;
-"
-`;
-
 exports[`public API should not change unintentionally Libraries/EventEmitter/NativeEventEmitter.js 1`] = `
 "interface NativeModule {
   addListener(eventType: string): void;

packages/react-native/ReactAndroid/api/ReactAndroid.api

@@ -3405,14 +3405,6 @@ public final class com/facebook/react/modules/devloading/DevLoadingModule : com/
 public final class com/facebook/react/modules/devloading/DevLoadingModule$Companion {
 }
 
-public final class com/facebook/react/modules/devtoolssettings/DevToolsSettingsManagerModule : com/facebook/fbreact/specs/NativeDevToolsSettingsManagerSpec {
-	public fun <init> (Lcom/facebook/react/bridge/ReactApplicationContext;)V
-	public fun getConsolePatchSettings ()Ljava/lang/String;
-	public fun getProfilingSettings ()Ljava/lang/String;
-	public fun setConsolePatchSettings (Ljava/lang/String;)V
-	public fun setProfilingSettings (Ljava/lang/String;)V
-}
-
 public class com/facebook/react/modules/dialog/AlertFragment : androidx/fragment/app/DialogFragment, android/content/DialogInterface$OnClickListener {
 	public fun <init> ()V
 	public fun <init> (Lcom/facebook/react/modules/dialog/DialogModule$AlertFragmentListener;Landroid/os/Bundle;)V
@@ -3670,6 +3662,12 @@ public final class com/facebook/react/modules/permissions/PermissionsModule : co
 	public fun shouldShowRequestPermissionRationale (Ljava/lang/String;Lcom/facebook/react/bridge/Promise;)V
 }
 
+public final class com/facebook/react/modules/reactdevtoolssettings/ReactDevToolsSettingsManagerModule : com/facebook/fbreact/specs/NativeReactDevToolsSettingsManagerSpec {
+	public fun <init> (Lcom/facebook/react/bridge/ReactApplicationContext;)V
+	public fun getGlobalHookSettings ()Ljava/lang/String;
+	public fun setGlobalHookSettings (Ljava/lang/String;)V
+}
+
 public final class com/facebook/react/modules/share/ShareModule : com/facebook/fbreact/specs/NativeShareModuleSpec {
 	public static final field Companion Lcom/facebook/react/modules/share/ShareModule$Companion;
 	public static final field ERROR_INVALID_CONTENT Ljava/lang/String;

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/reactdevtoolssettings/ReactDevToolsSettingsManagerModule.kt

@@ -0,0 +1,33 @@
+/*
+ * 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.modules.reactdevtoolssettings
+
+import android.content.Context
+import android.content.SharedPreferences
+import com.facebook.fbreact.specs.NativeReactDevToolsSettingsManagerSpec
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.annotations.ReactModule
+
+@ReactModule(name = NativeReactDevToolsSettingsManagerSpec.NAME)
+public class ReactDevToolsSettingsManagerModule(reactContext: ReactApplicationContext) :
+    NativeReactDevToolsSettingsManagerSpec(reactContext) {
+
+  private val sharedPreferences: SharedPreferences =
+      reactContext.getSharedPreferences(SHARED_PREFERENCES_PREFIX, Context.MODE_PRIVATE)
+
+  public override fun setGlobalHookSettings(settings: String): Unit =
+      sharedPreferences.edit().putString(KEY_HOOK_SETTINGS, settings).apply()
+
+  public override fun getGlobalHookSettings(): String? =
+      sharedPreferences.getString(KEY_HOOK_SETTINGS, null)
+
+  private companion object {
+    private const val SHARED_PREFERENCES_PREFIX = "ReactNative__DevToolsSettings"
+    private const val KEY_HOOK_SETTINGS = "HookSettings"
+  }
+}

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java

@@ -28,14 +28,14 @@
 import com.facebook.react.modules.camera.ImageStoreManager;
 import com.facebook.react.modules.clipboard.ClipboardModule;
 import com.facebook.react.modules.devloading.DevLoadingModule;
-import com.facebook.react.modules.devtoolssettings.DevToolsSettingsManagerModule;
 import com.facebook.react.modules.dialog.DialogModule;
 import com.facebook.react.modules.fresco.FrescoModule;
 import com.facebook.react.modules.i18nmanager.I18nManagerModule;
 import com.facebook.react.modules.image.ImageLoaderModule;
 import com.facebook.react.modules.intent.IntentModule;
 import com.facebook.react.modules.network.NetworkingModule;
 import com.facebook.react.modules.permissions.PermissionsModule;
+import com.facebook.react.modules.reactdevtoolssettings.ReactDevToolsSettingsManagerModule;
 import com.facebook.react.modules.share.ShareModule;
 import com.facebook.react.modules.sound.SoundManagerModule;
 import com.facebook.react.modules.statusbar.StatusBarModule;
@@ -87,6 +87,7 @@
       NativeAnimatedModule.class,
       NetworkingModule.class,
       PermissionsModule.class,
+      ReactDevToolsSettingsManagerModule.class,
       ShareModule.class,
       SoundManagerModule.class,
       StatusBarModule.class,
@@ -153,8 +154,8 @@ public MainReactPackage(MainPackageConfig config) {
         return new VibrationModule(context);
       case WebSocketModule.NAME:
         return new WebSocketModule(context);
-      case DevToolsSettingsManagerModule.NAME:
-        return new DevToolsSettingsManagerModule(context);
+      case ReactDevToolsSettingsManagerModule.NAME:
+        return new ReactDevToolsSettingsManagerModule(context);
       default:
         return null;
     }
@@ -300,7 +301,7 @@ private ReactModuleInfoProvider fallbackForMissingClass() {
           NativeAnimatedModule.class,
           NetworkingModule.class,
           PermissionsModule.class,
-          DevToolsSettingsManagerModule.class,
+          ReactDevToolsSettingsManagerModule.class,
           ShareModule.class,
           StatusBarModule.class,
           SoundManagerModule.class,

packages/react-native/package.json

@@ -136,7 +136,7 @@
     "nullthrows": "^1.1.1",
     "pretty-format": "^29.7.0",
     "promise": "^8.3.0",
-    "react-devtools-core": "^5.3.1",
+    "react-devtools-core": "^6.0.0",
     "react-refresh": "^0.14.0",
     "regenerator-runtime": "^0.13.2",
     "scheduler": "0.25.0-rc-fb9a90fa48-20240614",