Merge pull request #380 from rupak0577/avdmanager

Wait for emulator to complete booting

Author: codeanticode

src/processing/mode/android/AndroidRunner.java

@@ -45,8 +45,6 @@ public class AndroidRunner implements DeviceListener {
   protected PrintStream sketchErr;
   protected PrintStream sketchOut;
 
-  protected boolean showedSlowEmuWarning = false;
-
   public AndroidRunner(AndroidBuild build, RunnerListener listener) {
     this.build = build;
     this.listener = listener;
@@ -98,18 +96,6 @@ 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 && !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("Cannot run the sketch yet...",
-          "This is common when the emulator is booting up for the first time.\n" +
-          "Just try again once the emulator is ready, or set the\n" + 
-          "ADB_INSTALL_TIMEOUT environmental variable to have a\n" +
-          "longer timeout, for example 5 minutes or more.\n\n"+
-          "Once the emulator is running, don't close until you are done\n" + 
-          "working with Processing.\n");
-      }      
       Devices.killAdbServer();  // see above
       return false;
     }

src/processing/mode/android/EmulatorController.java

@@ -69,7 +69,7 @@ synchronized public void launch(File sdkToolsPath, boolean wear)
     // https://developer.android.com/studio/run/emulator-commandline.html
     String avdName = AVD.getName(wear);
 
-    String portString = AVD.getPreferredPort(wear);
+    final String portString = AVD.getPreferredPort(wear);
 
     // We let the emulator decide what's better for hardware acceleration:
     // https://developer.android.com/studio/run/emulator-acceleration.html#accel-graphics
@@ -143,12 +143,11 @@ public void run() {
             }
             Thread.sleep(2000);
             //System.out.println("done sleeping");
-            for (final String device : Devices.list()) {
-              if (device.contains("emulator")) {
-                //System.err.println("EmulatorController: Emulator booted.");
-                setState(State.RUNNING);
-                return;
-              }
+            ProcessResult result = AndroidSDK.runADB("-s", "emulator-" + portString,
+                    "shell", "getprop", "dev.bootcomplete");
+            if (result.getStdout().equals("1\n")) {
+              setState(State.RUNNING);
+              return;
             }
           }
           System.err.println("EmulatorController: Emulator never booted. " + state);