don't ask AVD arch if already installed

Author: codeanticode

src/processing/mode/android/AVD.java

@@ -477,7 +477,12 @@ static public boolean ensureProperAVD(final Frame window, final AndroidMode mode
         return false;
       }
       if (!avd.hasImages(sdk)) {
-        boolean res = AndroidSDK.locateSysImage(window, mode, wear);
+        // Check that the AVD for the other kind of device has been already
+        // downloaded, and if so, the downloader should not ask for an 
+        // ABI again.
+        AVD other = wear ? phoneAVD : watchAVD;
+        boolean ask = !other.hasImages(sdk);        
+        boolean res = AndroidSDK.locateSysImage(window, mode, wear, ask);
         if (!res) {
           return false;
         } else {

src/processing/mode/android/AndroidBuild.java

@@ -31,8 +31,6 @@
 import processing.app.Sketch;
 import processing.app.SketchException;
 import processing.app.Util;
-import processing.app.exec.ProcessHelper;
-import processing.app.exec.ProcessResult;
 import processing.core.PApplet;
 import processing.mode.java.JavaBuild;
 import processing.mode.java.preproc.SurfaceInfo;

src/processing/mode/android/AndroidSDK.java

@@ -478,11 +478,11 @@ static public AndroidSDK locate(final Frame window, final AndroidMode androidMod
   }
 
   static public boolean locateSysImage(final Frame window, 
-      final AndroidMode androidMode, boolean wear)
+      final AndroidMode androidMode, final boolean wear, final boolean ask)
       throws BadSDKException, CancelException, IOException {
     final int result = showDownloadSysImageDialog(window, wear);
     if (result == JOptionPane.YES_OPTION) {
-      return downloadSysImage(window, androidMode, wear);
+      return downloadSysImage(window, androidMode, wear, ask);
     } else if (result == JOptionPane.NO_OPTION) {
       return false;
     } else {
@@ -514,9 +514,9 @@ static public AndroidSDK download(final Frame editor, final AndroidMode androidM
   }
 
   static public boolean downloadSysImage(final Frame editor, 
-      final AndroidMode androidMode, final boolean wear) 
+      final AndroidMode androidMode, final boolean wear, final boolean ask) 
       throws BadSDKException, CancelException {
-    final SysImageDownloader downloader = new SysImageDownloader(editor, wear);    
+    final SysImageDownloader downloader = new SysImageDownloader(editor, wear, ask);    
     downloader.run(); // This call blocks until the SDK download complete, or user cancels.
 
     if (downloader.cancelled()) {
@@ -704,9 +704,9 @@ public ProcessResult runADB(final String... cmd)
       adbCmd = cmd;
     }
     // printing this here to see if anyone else is killing the adb server
-//    if (processing.app.Base.DEBUG) {
+    if (processing.app.Base.DEBUG) {
       PApplet.printArray(adbCmd);
-//    }
+    }
     try {
       ProcessResult adbResult = new ProcessHelper(adbCmd).execute();
       // Ignore messages about starting up an adb daemon

src/processing/mode/android/SysImageDownloader.java

@@ -112,6 +112,7 @@ public class SysImageDownloader extends JDialog implements PropertyChangeListene
   private Frame editor;
   private boolean result;
   private boolean wear;
+  private boolean askABI;
   private String abi;
   private boolean cancelled;
 
@@ -400,10 +401,11 @@ public void hyperlinkUpdate(HyperlinkEvent e) {
     }
   }
 
-  public SysImageDownloader(Frame editor, boolean wear) {
+  public SysImageDownloader(Frame editor, boolean wear, boolean ask) {
     super(editor, "System image download", true);
     this.editor = editor;
     this.wear = wear;
+    this.askABI = ask;
     this.result = false;    
     createLayout();
   }
@@ -412,7 +414,7 @@ public void run() {
     cancelled = false;
 
     abi = Preferences.get("android.emulator.image.abi");
-    if (abi == null || abi.equals(AVD.DEFAULT_ABI)) {
+    if (abi == null || askABI) {
       // Either there was no image architecture selected, or the default was set.
       // In this case, we give the user the option to choose between ARM and x86
       final int result = showSysImageMessage();