flutter · littleGnAl · Feb 26, 2026
@@ -744,7 +744,17 @@ public FlutterEngine provideFlutterEngine(@NonNull Context context) {
    */
   @Override
   public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
-    if (flutterFragment != null && flutterFragment.isFlutterEngineInjected()) {
+    FlutterFragment attachedFlutterFragment = flutterFragment;
+    if (attachedFlutterFragment == null) {
+      // During activity recreation, `FragmentManager` may restore and attach an existing
+      // `FlutterFragment` before `ensureFlutterFragmentCreated()` refreshes the
+      // `flutterFragment` field.
+      // Query by tag here so plugin auto-registration can still honor the injected-engine guard.
+      // Keep `flutterFragment` field ownership in `ensureFlutterFragmentCreated()`; this lookup
+      // only informs the guard.
+      attachedFlutterFragment = retrieveExistingFlutterFragmentIfPossible();
+    }
+    if (attachedFlutterFragment != null && attachedFlutterFragment.isFlutterEngineInjected()) {
       // If the FlutterEngine was explicitly built and injected into this FlutterActivity, the
       // builder should explicitly decide whether to automatically register plugins via the
       // FlutterEngine's construction parameter or via the AndroidManifest metadata.

@@ -259,6 +259,48 @@ public void itHandlesNewFragmentRecreationDuringRestoreWhenActivityIsRecreated()
     assertEquals(0, activity.numberOfEnginesCreated);
   }
 
+  @Test
+  public void configureFlutterEngine_doesNotRegisterPluginsWhenRecoveredInjectedFragmentIsFound() {
+    FlutterFragmentActivityWithProvidedEngine activity =
+        spy(Robolectric.buildActivity(FlutterFragmentActivityWithProvidedEngine.class).get());
+
+    FlutterFragment fragment = mock(FlutterFragment.class);
+    when(fragment.isFlutterEngineInjected()).thenReturn(true);
+    when(activity.retrieveExistingFlutterFragmentIfPossible()).thenReturn(fragment);
+
+    FlutterEngine engine = mock(FlutterEngine.class);
+    activity.configureFlutterEngine(engine);
+
+    assertTrue(GeneratedPluginRegistrant.getRegisteredEngines().isEmpty());
+  }
+
+  @Test
+  public void recreate_withCachedEngine_doesNotRegisterPlugins() {
+    FlutterLoader mockFlutterLoader = mock(FlutterLoader.class);
+    FlutterJNI mockFlutterJni = mock(FlutterJNI.class);
+    when(mockFlutterJni.isAttached()).thenReturn(true);
+    when(mockFlutterLoader.automaticallyRegisterPlugins()).thenReturn(false);
+
+    FlutterEngine cachedEngine =
+        new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni, new String[] {}, false);
+    final String cachedEngineId = "recreate_cached_engine";
+    FlutterEngineCache.getInstance().put(cachedEngineId, cachedEngine);
+    Intent intent = FlutterFragmentActivity.withCachedEngine(cachedEngineId).build(ctx);
+
+    try (ActivityScenario<FlutterFragmentActivity> scenario = ActivityScenario.launch(intent)) {
+      scenario.onActivity(
+          activity -> assertTrue(GeneratedPluginRegistrant.getRegisteredEngines().isEmpty()));
+
+      scenario.recreate();
+
+      scenario.onActivity(
+          activity -> assertTrue(GeneratedPluginRegistrant.getRegisteredEngines().isEmpty()));
+    } finally {
+      FlutterEngineCache.getInstance().remove(cachedEngineId);
+      cachedEngine.destroy();
+    }
+  }
+
   @Test
   @Config(minSdk = Build.API_LEVELS.API_34)
   @TargetApi(Build.API_LEVELS.API_34)