Merge branch 'master' into cq_dep_coverageRunner

Author: pq

src/io/flutter/actions/OpenInAndroidStudioAction.java

@@ -32,6 +32,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
+import java.lang.reflect.InvocationTargetException;
 
 /**
  * This action has been removed from the plugin.xml as a required dependent method call {GradleProjectImporter.importAndOpenProjectCore()
@@ -63,10 +64,11 @@ public void actionPerformed(@NotNull final AnActionEvent event) {
         //noinspection unchecked
         final Class<OpenInAndroidStudioAction> opener =
           (Class<OpenInAndroidStudioAction>)Class.forName("io.flutter.actions.OpenAndroidModule");
-        opener.newInstance().actionPerformed(event);
+        opener.getDeclaredConstructor().newInstance().actionPerformed(event);
         return;
       }
-      catch (ClassNotFoundException | IllegalAccessException | InstantiationException ignored) {
+      catch (ClassNotFoundException | IllegalAccessException | InstantiationException | NoSuchMethodException |
+             InvocationTargetException ignored) {
       }
     }
 

src/io/flutter/vmService/VMServiceManager.java

@@ -9,7 +9,6 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.text.StringUtil;
 import io.flutter.run.daemon.FlutterApp;
 import io.flutter.utils.EventStream;
@@ -415,12 +414,6 @@ public boolean hasServiceExtensionNow(String name) {
     }
   }
 
-  public void hasServiceExtension(String name, Consumer<Boolean> onData, Disposable parentDisposable) {
-    if (!Disposer.isDisposed(parentDisposable)) {
-      Disposer.register(parentDisposable, hasServiceExtension(name, onData));
-    }
-  }
-
   public boolean hasRegisteredService(String name) {
     return registeredServices.contains(name);
   }