From 1805dcbb63f5d4a509025b36140b8b46184a33d5 Mon Sep 17 00:00:00 2001
From: Helin Shiah <helinx@google.com>
Date: Fri, 17 Oct 2025 13:57:40 -0700
Subject: [PATCH 1/2] Use new API for opening android module

---
 resources/META-INF/plugin.xml                 | 6 +++---
 src/io/flutter/actions/OpenAndroidModule.java | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index 17ad7e59e1..5ac09ff49c 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -111,9 +111,9 @@
               text="Open Flutter DevTools in Browser"
               description="Open Flutter DevTools in Browser"/>
       <separator/>
-<!--      <action id="flutter.androidstudio.open" class="io.flutter.actions.OpenInAndroidStudioAction"-->
-<!--              text="Open Android module in Android Studio"-->
-<!--              description="Launch Android Studio to edit the Android module as a top-level project"/>-->
+      <action id="flutter.androidstudio.open" class="io.flutter.actions.OpenInAndroidStudioAction"
+              text="Open Android module in Android Studio"
+              description="Launch Android Studio to edit the Android module as a top-level project"/>
       <action id="flutter.xcode.open" class="io.flutter.actions.OpenInXcodeAction"
               text="Open iOS/macOS Module in Xcode"
               description="Launch Xcode to edit the iOS module as a top-level project"/>
diff --git a/src/io/flutter/actions/OpenAndroidModule.java b/src/io/flutter/actions/OpenAndroidModule.java
index b517b916d3..b35964303f 100644
--- a/src/io/flutter/actions/OpenAndroidModule.java
+++ b/src/io/flutter/actions/OpenAndroidModule.java
@@ -7,6 +7,7 @@
 
 import com.android.tools.idea.gradle.project.importing.GradleProjectImporter;
 import com.intellij.ide.actions.OpenFileAction;
+import com.intellij.ide.impl.OpenProjectTask;
 import com.intellij.openapi.actionSystem.ActionPlaces;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -17,11 +18,13 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.BitUtil;
 import io.flutter.FlutterMessages;
+import org.jdom.JDOMException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.gradle.util.GradleConstants;
 
 import java.awt.event.ActionEvent;
+import java.io.IOException;
 import java.nio.file.Path;
 
 import static com.android.tools.idea.gradle.project.ProjectImportUtil.findGradleTarget;
@@ -61,8 +64,8 @@ private static void openOrImportProject(@NotNull VirtualFile projectFile,
     if (canImportAsGradleProject(projectFile)) {
       VirtualFile target = findGradleTarget(projectFile);
       if (target != null) {
-        GradleProjectImporter gradleImporter = GradleProjectImporter.getInstance();
-        gradleImporter.importAndOpenProjectCore(null, true, projectFile);
+        com.intellij.ide.impl.ProjectUtil.openOrImport(projectFile.toNioPath(), OpenProjectTask.build().withForceOpenInNewFrame(forceOpenInNewFrame));
+
         for (Project proj : ProjectManager.getInstance().getOpenProjects()) {
           if (projectFile.equals(ProjectUtil.guessProjectDir(proj)) || projectFile.equals(proj.getProjectFile())) {
             if (sourceFile != null && !sourceFile.isDirectory()) {

From aa1ee66ed06503123bf1ef0914eaaaaf2dd0cb94 Mon Sep 17 00:00:00 2001
From: Helin Shiah <helinx@google.com>
Date: Fri, 17 Oct 2025 13:58:17 -0700
Subject: [PATCH 2/2] Remove unused exceptions

---
 src/io/flutter/actions/OpenAndroidModule.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/io/flutter/actions/OpenAndroidModule.java b/src/io/flutter/actions/OpenAndroidModule.java
index b35964303f..0673312898 100644
--- a/src/io/flutter/actions/OpenAndroidModule.java
+++ b/src/io/flutter/actions/OpenAndroidModule.java
@@ -5,7 +5,6 @@
  */
 package io.flutter.actions;
 
-import com.android.tools.idea.gradle.project.importing.GradleProjectImporter;
 import com.intellij.ide.actions.OpenFileAction;
 import com.intellij.ide.impl.OpenProjectTask;
 import com.intellij.openapi.actionSystem.ActionPlaces;
@@ -18,13 +17,11 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.BitUtil;
 import io.flutter.FlutterMessages;
-import org.jdom.JDOMException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.gradle.util.GradleConstants;
 
 import java.awt.event.ActionEvent;
-import java.io.IOException;
 import java.nio.file.Path;
 
 import static com.android.tools.idea.gradle.project.ProjectImportUtil.findGradleTarget;