diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f5c470a4..8321aff7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,9 @@
-## Unreleased
+## 88.0.0
 
 ### Added
 
+- Support for Android Studio 2025.2
+
 ### Removed
 
 - The Flutter version is now read from the file ./bin/cache/flutter.version.json, required in Flutter 3.33+ (#8465)
diff --git a/build.gradle.kts b/build.gradle.kts
index c44945d0a..0fe339045 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -152,9 +152,7 @@ sourceSets {
   test {
     java.srcDirs(
       listOf(
-        "src",
-        "testSrc/unit",
-        "third_party/vmServiceDrivers"
+        "testSrc/unit"
       )
     )
     resources.srcDirs(
diff --git a/gradle.properties b/gradle.properties
index 53ebd2ce0..610437a57 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,8 +4,8 @@
 # found in the LICENSE file.
 #
 
-ideaVersion=2025.1.3.4
-dartPluginVersion= 251.27623.5
+ideaVersion=2025.2.1.3
+dartPluginVersion= 252.25557.23
 sinceBuild=243
 untilBuild=253.*
 javaVersion=21
diff --git a/src/io/flutter/utils/AndroidLocationProvider.java b/src/io/flutter/utils/AndroidLocationProvider.java
index ce064d0fd..70de2099a 100644
--- a/src/io/flutter/utils/AndroidLocationProvider.java
+++ b/src/io/flutter/utils/AndroidLocationProvider.java
@@ -9,10 +9,12 @@
 import com.android.tools.idea.gradle.project.model.GradleModuleModel;
 import com.android.tools.idea.gradle.util.GradleProjectSystemUtil;
 import com.android.tools.idea.projectsystem.AndroidProjectRootUtil;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import io.flutter.logging.PluginLogger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.SystemIndependent;
@@ -20,13 +22,20 @@
 // Copied from GradleModelSource.ResolvedConfigurationFileLocationProviderImpl
 // This file must be ignored in pre-4.1 builds.
 public class AndroidLocationProvider implements BuildModelContext.ResolvedConfigurationFileLocationProvider {
+  final static private Logger LOG = PluginLogger.createLogger(AndroidLocationProvider.class);
+
   @Nullable
   @Override
   public VirtualFile getGradleBuildFile(@NotNull Module module) {
-    GradleModuleModel moduleModel = GradleProjectSystemUtil.getGradleModuleModel(module);
-    if (moduleModel != null) {
-      return moduleModel.getBuildFile();
-    }
+    // TODO(helin24): Delete this code (and potentially related code) if commenting out has no negative impact on Android editing.
+    // I believe this is to make gradle files show up nicely when a flutter project is opened, but this functionality already does not work
+    // and is not needed if we are recommending users edit Android files in a separate project window.
+
+    //GradleModuleModel moduleModel = GradleProjectSystemUtil.getGradleModuleModel(module);
+    //if (moduleModel != null) {
+    //  return moduleModel.getBuildFile();
+    //}
+    LOG.info("getGradleBuildFile attempted for module " + module.getName() + " but will return null");
     return null;
   }