diff --git a/packages/flutter_tools/lib/src/android/android_emulator.dart b/packages/flutter_tools/lib/src/android/android_emulator.dart index 8429346c264..3602aa08232 100644 --- a/packages/flutter_tools/lib/src/android/android_emulator.dart +++ b/packages/flutter_tools/lib/src/android/android_emulator.dart @@ -17,7 +17,7 @@ class AndroidEmulators extends EmulatorDiscovery { bool get supportsPlatform => true; @override - bool get canListAnything => androidWorkflow.canListDevices; + bool get canListAnything => androidWorkflow.canListEmulators; @override Future> get emulators async => getEmulatorAvds(); @@ -44,9 +44,9 @@ List getEmulatorAvds() { if (emulatorPath == null) return []; final String text = runSync([emulatorPath, '-list-avds']); - final List devices = []; - parseEmulatorAvdOutput(text, devices); - return devices; + final List emulators = []; + parseEmulatorAvdOutput(text, emulators); + return emulators; } /// Parse the given `emulator -list-avds` output in [text], and fill out the given list diff --git a/packages/flutter_tools/lib/src/android/android_workflow.dart b/packages/flutter_tools/lib/src/android/android_workflow.dart index 11874095196..db40d655266 100644 --- a/packages/flutter_tools/lib/src/android/android_workflow.dart +++ b/packages/flutter_tools/lib/src/android/android_workflow.dart @@ -45,9 +45,6 @@ class AndroidWorkflow extends DoctorValidator implements Workflow { @override bool get canListEmulators => getEmulatorPath(androidSdk) != null; - @override - bool get canLaunchEmulators => androidSdk != null && androidSdk.validateSdkWellFormed().isEmpty; - static const String _kJdkDownload = 'https://www.oracle.com/technetwork/java/javase/downloads/'; /// Returns false if we cannot determine the Java version or if the version diff --git a/packages/flutter_tools/lib/src/doctor.dart b/packages/flutter_tools/lib/src/doctor.dart index e8677a28f4c..ebae76b6e2b 100644 --- a/packages/flutter_tools/lib/src/doctor.dart +++ b/packages/flutter_tools/lib/src/doctor.dart @@ -212,9 +212,6 @@ abstract class Workflow { /// Are we functional enough to list emulators? bool get canListEmulators; - - /// Could this thing launch *something*? It may still have minor issues. - bool get canLaunchEmulators; } enum ValidationType { diff --git a/packages/flutter_tools/lib/src/ios/ios_workflow.dart b/packages/flutter_tools/lib/src/ios/ios_workflow.dart index f92838392f5..1d3b59daa1e 100644 --- a/packages/flutter_tools/lib/src/ios/ios_workflow.dart +++ b/packages/flutter_tools/lib/src/ios/ios_workflow.dart @@ -33,9 +33,6 @@ class IOSWorkflow extends DoctorValidator implements Workflow { @override bool get canListEmulators => false; - @override - bool get canLaunchEmulators => false; - Future get hasIDeviceInstaller => exitsHappyAsync(['ideviceinstaller', '-h']); Future get hasIosDeploy => exitsHappyAsync(['ios-deploy', '--version']);