re-launch emulator is not found, but still in running state

Author: codeanticode

src/processing/mode/android/AndroidRunner.java

@@ -45,6 +45,7 @@ public class AndroidRunner implements DeviceListener {
   protected PrintStream sketchErr;
   protected PrintStream sketchOut;
 
+  protected boolean showedSlowEmuWarning = false;
 
   public AndroidRunner(AndroidBuild build, RunnerListener listener) {
     this.build = build;
@@ -97,7 +98,8 @@ public boolean launch(Future<Device> deviceFuture, int comp, boolean emu) {
     // this stopped working with Android SDK tools revision 17
     if (!device.installApp(build, listener)) {
       listener.statusError("Lost connection with " + devStr + " while installing. Try again.");
-      if (emu) {
+      if (emu && !showedSlowEmuWarning) {
+        showedSlowEmuWarning = true; 
         // More detailed message when using the emulator, to following discussion in
         // https://code.google.com/p/android/issues/detail?id=104305
         Messages.showWarning("The emulator is slooow...",

src/processing/mode/android/Devices.java

@@ -124,36 +124,33 @@ public Device call() throws Exception {
   }
 
 
-  private final Device blockingGetEmulator(File sdkToolsPath, final boolean wear, final boolean gpu) {
-//    System.out.println("going looking for emulator");
+  private final Device blockingGetEmulator(final File sdkToolsPath, 
+      final boolean wear, final boolean gpu) {
     String port = AVD.getPort(wear);
     Device emu = find(true, port);
     if (emu != null) {
-//      System.out.println("found emu " + emu);
       return emu;
     }
-//    System.out.println("no emu found");
 
     EmulatorController emuController = EmulatorController.getInstance(wear);
-//    System.out.println("checking emulator state");
+    if (emuController.getState() == State.RUNNING) {
+      // The emulator is in running state, but did not find any emulator device,
+      // to the most common cause is that it was closed, so we will re-launch it.
+      emuController.setState(State.NOT_RUNNING);
+    }
+    
     if (emuController.getState() == State.NOT_RUNNING) {
       try {
-//        System.out.println("not running, gonna launch");
         emuController.launch(sdkToolsPath, wear, gpu); // this blocks until emulator boots
-//        System.out.println("not just gonna, we've done the launch");
       } catch (final IOException e) {
         System.err.println("Problem while launching emulator.");
         e.printStackTrace(System.err);
         return null;
       }
     } else {
-      System.out.println("Emulator is " + emuController.getState() +
-                         ", which is not expected.");
-
+      return null;
     }
-//    System.out.println("and now we're out");
 
-//    System.out.println("Devices.blockingGet thread is " + Thread.currentThread());
     while (!Thread.currentThread().isInterrupted()) {
       //      System.err.println("AndroidEnvironment: looking for emulator in loop.");
       //      System.err.println("AndroidEnvironment: emulatorcontroller state is "

src/processing/mode/android/EmulatorController.java

@@ -26,6 +26,7 @@
 import java.util.concurrent.CountDownLatch;
 
 import processing.app.Base;
+import processing.app.Platform;
 import processing.app.Preferences;
 import processing.app.exec.*;
 
@@ -82,7 +83,7 @@ synchronized public void launch(File sdkToolsPath, boolean wear, boolean gpu) th
       }
     }
 
-    // See http://developer.android.com/guide/developing/tools/emulator.html
+    // https://developer.android.com/studio/run/emulator-commandline.html
     String avdName;
     if (wear) {
       avdName = AVD.wearAVD.name;
@@ -93,9 +94,8 @@ synchronized public void launch(File sdkToolsPath, boolean wear, boolean gpu) th
     // https://developer.android.com/studio/run/emulator-acceleration.html#accel-graphics
     String gpuFlag = gpu ? "auto" : "off";
 
-    File emulatorPath = new File(sdkToolsPath, "emulator");
-    if(!emulatorPath.exists())
-      emulatorPath = new File(sdkToolsPath, "emulator.exe"); //Windows
+    File emulatorPath = Platform.isWindows() ? new File(sdkToolsPath, "emulator.exe") :
+                                               new File(sdkToolsPath, "emulator");
     final String[] cmd = new String[] {
       emulatorPath.getCanonicalPath(),
       "-avd", avdName,